From 16e6d22408cd00852bc1a796815e77820d0df788 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 8 Sep 2003 21:26:30 +0000 Subject: Fix valgrind-found read of uninit variable (ensure length is right). Jeremy. (This used to be commit 6fc0e529f70253244628017a372257e8dc053294) --- source3/lib/charcnv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 5a922e226c..5f3cf64a68 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -270,7 +270,7 @@ size_t convert_string(charset_t from, charset_t to, break; } else { if (srclen == (size_t)-1) { - srclen = strlen(src)+1; + srclen = strlen(p)+1; } return retval + convert_string_internal(from, to, p, srclen, q, destlen); } @@ -296,7 +296,7 @@ size_t convert_string(charset_t from, charset_t to, break; } else { if (srclen == (size_t)-1) { - srclen = strlen_w(src)+2; + srclen = strlen_w((const void *)p)+2; } return retval + convert_string_internal(from, to, p, srclen, q, destlen); } @@ -322,7 +322,7 @@ size_t convert_string(charset_t from, charset_t to, break; } else { if (srclen == (size_t)-1) { - srclen = strlen(src)+1; + srclen = strlen(p)+1; } return retval + convert_string_internal(from, to, p, srclen, q, destlen); } -- cgit