From 4f051e735b85a24f37e2b844bcbb348f36600420 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 17 Sep 2007 10:50:59 +0000 Subject: r25195: Fix issue with calling pull_uc2_*alloc with str_len == 0. We should just return 0 in this case. Jeremy. (This used to be commit 8bb85f3f141f0f45b06d28f004cb2cf18252d4e1) --- source3/lib/charcnv.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source3/lib') diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index a8fb95df06..9e669a1c9c 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -1369,6 +1369,10 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_ { size_t ret; + if (!src_len) { + return 0; + } + if (dest_len == (size_t)-1) dest_len = sizeof(pstring); @@ -1446,6 +1450,10 @@ static size_t pull_ucs2_base_talloc(TALLOC_CTX *ctx, } #endif + if (!src_len) { + return 0; + } + if (ucs2_align(base_ptr, src, flags)) { src = (const void *)((const char *)src + 1); if (src_len != (size_t)-1) -- cgit