Changeset 862 for trunk/server/source3/smbd/mangle_hash2.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/mangle_hash2.c (modified) (2 diffs)

trunk/server/source3/smbd/mangle_hash2.c

@@ -627 +627 @@
                 if (((unsigned int)name[0]) > 128 && (name[1] != 0)) {
                         /* Possible start of mb character. */
-                        char mbc[2];
+                        size_t size = 0;
+                        (void)next_codepoint(name, &size);
                         /*
                          * Note that if CH_UNIX is utf8 a string may be 3
@@ -635 +636 @@
                          * JRA.
                          */
-                        if (convert_string(CH_UNIX, CH_UTF16LE, name, 2, mbc, 2, False) == 2) {
-                                /* Was a good mb string. */
-                                name += 2;
+                        if (size > 1) {
+                                /* Was a mb string. */
+                                name += size;
                                 continue;
                         }