Changeset 596 for trunk/server/source3/librpc/ndr

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/librpc/ndr/ndr_string.c (modified) (1 diff)

trunk/server/source3/librpc/ndr/ndr_string.c

@@ -715 +715 @@
 _PUBLIC_ uint32_t ndr_charset_length(const void *var, charset_t chset)
 {
-        /* FIXME: Treat special chars special here, taking chset into account */
-        /* Also include 0 byte */
+        switch (chset) {
+        /* case CH_UTF16: this has the same value as CH_UTF16LE */
+        case CH_UTF16LE:
+        case CH_UTF16BE:
+        case CH_UTF16MUNGED:
+        case CH_UTF8:
+                return strlen_m_ext_term((const char *)var, chset);
+        case CH_DISPLAY:
+        case CH_DOS:
+        case CH_UNIX:
+                return strlen((const char *)var)+1;
+        }
+
+        /* Fallback, this should never happen */
         return strlen((const char *)var)+1;
 }