From a67079882dd1b924d2e007e39b06da438533ef96 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 18 Jul 2002 23:01:44 +0000
Subject: [PATCH] Another bug found by valgrind. Don't AND a src length of -1.
 Jeremy.

---
 source/lib/charcnv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c
index d42dc994b00..ea5bb87bc38 100644
--- a/source/lib/charcnv.c
+++ b/source/lib/charcnv.c
@@ -562,7 +562,8 @@ int pull_ucs2(const void *base_ptr, char *dest, const void *src, int dest_len, i
 	}
 
 	/* ucs2 is always a multiple of 2 bytes */
-	src_len &= ~1;
+	if (src_len != -1)
+		src_len &= ~1;
 	
 	ret = convert_string(CH_UCS2, CH_UNIX, src, src_len, dest, dest_len);
 	if (dest_len) dest[MIN(ret, dest_len-1)] = 0;