Changeset 105 for branches/samba-3.0/source/lib/charcnv.c

Timestamp:

Nov 26, 2007, 9:24:27 AM (18 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.27a

File:

• branches/samba-3.0/source/lib/charcnv.c (modified) (2 diffs)

branches/samba-3.0/source/lib/charcnv.c

@@ -870 +870 @@
 size_t push_ascii(void *dest, const char *src, size_t dest_len, int flags)
 {
-    size_t src_len = strlen(src);
-    pstring tmpbuf;
+        size_t src_len = strlen(src);
+        pstring tmpbuf;
+        size_t ret;
 
         /* No longer allow a length of -1 */
@@ -886 +887 @@
         src_len++;
 
-    return convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len, True);
+        ret =convert_string(CH_UNIX, CH_DOS, src, src_len, dest, dest_len, True);
+        if (ret == (size_t)-1 &&
+                        (flags & (STR_TERMINATE | STR_TERMINATE_ASCII))
+                        && dest_len > 0) {
+                ((char *)dest)[0] = '\0';
+        }
+        return ret;
+
 }