summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-05-08 05:10:44 +0000
committerTim Potter <tpot@samba.org>2003-05-08 05:10:44 +0000
commitbbdc326f15894293c7730a73151c8ad02b58d4e7 (patch)
treed0c40cf66edfe2ac0dda97390daeb2398ce0431a
parent5f86a4a85f4f3e738e1e0fa572d3931f31931d43 (diff)
downloadsamba-bbdc326f15894293c7730a73151c8ad02b58d4e7.tar.gz
samba-bbdc326f15894293c7730a73151c8ad02b58d4e7.tar.bz2
samba-bbdc326f15894293c7730a73151c8ad02b58d4e7.zip
Another attempt at undoing my bogus patch 1.55.2.19
(This used to be commit 05a684b3be1525aad3589ded9e59c3f012b5ef20)
-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 102b77592b..febd7d5496 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -420,6 +420,8 @@ size_t pull_ascii(char *dest, const void *src, size_t dest_len, size_t src_len,
if (dest_len)
dest[MIN(ret, dest_len-1)] = 0;
+ else
+ dest[0] = 0;
return src_len;
}