Changeset 597 for vendor/current/source3/lib/charcnv.c

Timestamp:

Jul 2, 2011, 4:01:14 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.9

File:

• vendor/current/source3/lib/charcnv.c (modified) (8 diffs)

vendor/current/source3/lib/charcnv.c

@@ -574 +574 @@
                 return false;
         }
+
         if (srclen == 0) {
-                ob = talloc_strdup(ctx, "");
+                /* We really should treat this as an error, but
+                   there are too many callers that need this to
+                   return a NULL terminated string in the correct
+                   character set. */
+                if (to == CH_UTF16LE|| to == CH_UTF16BE || to == CH_UTF16MUNGED) {
+                        destlen = 2;
+                } else {
+                        destlen = 1;
+                }
+                ob = talloc_zero_array(ctx, char, destlen);
                 if (ob == NULL) {
                         errno = ENOMEM;
                         return false;
                 }
+                *converted_size = destlen;
                 *dest = ob;
-                *converted_size = 0;
                 return true;
         }
@@ -678 +688 @@
         ob[destlen+1] = '\0';
 
+        /* Ensure we can never return a *converted_size of zero. */
+        if (destlen == 0) {
+                /* This can happen from a bad iconv "use_as_is:" call. */
+                if (to == CH_UTF16LE|| to == CH_UTF16BE || to == CH_UTF16MUNGED) {
+                        destlen = 2;
+                } else {
+                        destlen = 1;
+                }
+        }
+
         *converted_size = destlen;
         return true;
@@ -1343 +1363 @@
 {
         size_t ret;
+        size_t ucs2_align_len = 0;
 
         if (dest_len == (size_t)-1) {
@@ -1360 +1381 @@
                 if (src_len != (size_t)-1)
                         src_len--;
+                ucs2_align_len = 1;
         }
 
@@ -1395 +1417 @@
         }
 
-        return src_len;
+        return src_len + ucs2_align_len;
 }
 
@@ -1421 +1443 @@
         char *dest;
         size_t dest_len;
+        size_t ucs2_align_len = 0;
 
         *ppdest = NULL;
@@ -1439 +1462 @@
                 if (src_len != (size_t)-1)
                         src_len--;
+                ucs2_align_len = 1;
         }
 
@@ -1504 +1528 @@
 
         *ppdest = dest;
-        return src_len;
+        return src_len + ucs2_align_len;
 }