summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-05-07 05:52:44 +0000
committerTim Potter <tpot@samba.org>2003-05-07 05:52:44 +0000
commit22fb803b39ec5deddcd4bc941508f01d005e463f (patch)
tree6b9ed1eed2c6d0287313d5a480d3ae6760cc9888 /source3
parent1af398b16913b9ae66ac66c4f65134dc4c8fb195 (diff)
downloadsamba-22fb803b39ec5deddcd4bc941508f01d005e463f.tar.gz
samba-22fb803b39ec5deddcd4bc941508f01d005e463f.tar.bz2
samba-22fb803b39ec5deddcd4bc941508f01d005e463f.zip
Whoops - that wasn't a whitespace syncup after all.
(This used to be commit 42d0414ed244b92b665cb231f6756f60391861dd)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/charcnv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 7acb7147fd..102b77592b 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -629,6 +629,8 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_
ret = convert_string(CH_UCS2, CH_UNIX, src, src_len, dest, dest_len);
if (dest_len)
dest[MIN(ret, dest_len-1)] = 0;
+ else
+ dest[0] = 0;
return src_len;
}