From b20f1a95a90033f711a26fdeeb49eaf3059ad91d Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 15 Jan 2004 19:03:18 +0000 Subject: * BUG 446 - setup_logging() in smbclient to be interactive (remove the timestamps) - Fix bad return value in pull_ucs2( needs more testing to make sure this didn't break something else) that caused clistr_pull() to always read the same string from the buffer (pull_usc2() could return -1 if the original source length was given as -1) - increment some debugging messages to avoid printing them out so often (This used to be commit 79fe75dcdf6cc38e18ca1231e4357893db4d4a08) --- source3/lib/charcnv.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/lib') diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 1c6058a43e..5f9392b620 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -940,6 +940,10 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_ src_len &= ~1; ret = convert_string(CH_UCS2, CH_UNIX, src, src_len, dest, dest_len); + + if (src_len == (size_t)-1) + src_len = ret*2; + if (dest_len) dest[MIN(ret, dest_len-1)] = 0; else -- cgit