Merge of pull_ascii() and pull_ucs2() termination fixes from 3.0

diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c
index c3360bbb65891b60a29cb4e137b0532a8a8eb58e..eb427cc0fce23ac39a3b4dc88ca98a9efeb7b116 100644 (file)
--- a/source/lib/charcnv.c
+++ b/source/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;
 }
@@ -629,6 +631,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;
 }