]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
CVE-2019-14907 lib/util/charset: clang: Fix Value stored to 'reason' is never read...
authorNoel Power <noel.power@suse.com>
Fri, 24 May 2019 13:37:00 +0000 (13:37 +0000)
committerKarolin Seeger <kseeger@samba.org>
Fri, 10 Jan 2020 10:56:20 +0000 (11:56 +0100)
Fixes:

lib/util/charset/convert_string.c:301:5: warning: Value stored to 'reason' is never read <--[clang]

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14208

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Gary Lockyer gary@catalyst.net.nz
(cherry picked from commit add47e288bc80c1bf45765d1588a9fa5998ea677)

lib/util/charset/convert_string.c

index 196302aacfdd475b8a60bcbefd7c496af8228380..34facab6fe6f4e88944bc14c8fceac1c07eab7ab 100644 (file)
@@ -300,13 +300,13 @@ bool convert_string_handle(struct smb_iconv_handle *ic,
                        {
                                reason="No more room";
                                if (from == CH_UNIX) {
-                                       DEBUG(3,("E2BIG: convert_string(%s,%s): srclen=%u destlen=%u - '%s'\n",
+                                       DEBUG(3,("E2BIG: convert_string(%s,%s): srclen=%u destlen=%u - '%s' error: %s\n",
                                                 charset_name(ic, from), charset_name(ic, to),
-                                                (unsigned int)srclen, (unsigned int)destlen, (const char *)src));
+                                                (unsigned int)srclen, (unsigned int)destlen, (const char *)src, reason));
                                } else {
-                                       DEBUG(3,("E2BIG: convert_string(%s,%s): srclen=%u destlen=%u\n",
+                                       DEBUG(3,("E2BIG: convert_string(%s,%s): srclen=%u destlen=%u error: %s\n",
                                                 charset_name(ic, from), charset_name(ic, to),
-                                                (unsigned int)srclen, (unsigned int)destlen));
+                                                (unsigned int)srclen, (unsigned int)destlen, reason));
                                }
                                break;
                        }