From d33b294b9aa6059bd0831a264b427108bd2d5db2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 26 Feb 2001 05:11:06 +0000
Subject: fixed a bug in non-terminated unicode strings with clistr_pull()
 (This used to be commit 339bcfd05d3260a123ccf3c06429da6bfe621f74)

---
 source3/libsmb/clistr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c
index e07b4d5a63..52137d9f78 100644
--- a/source3/libsmb/clistr.c
+++ b/source3/libsmb/clistr.c
@@ -140,7 +140,7 @@ int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len
 		len = strlen(dest)*2 + 2;
 	} else {
 		int i, c;
-		if (dest_len < src_len) src_len = dest_len;
+		if (dest_len*2 < src_len) src_len = 2*dest_len;
 		for (i=0; i < src_len; i += 2) {
 			c = SVAL(src, i);
 			*dest++ = c;
-- 
cgit