]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
librpc:ndr: Don’t try to log always‐NULL string
authorJoseph Sutton <josephsutton@catalyst.net.nz>
Thu, 16 Nov 2023 21:45:29 +0000 (10:45 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 20 Nov 2023 21:50:32 +0000 (21:50 +0000)
Commit c51795c747198f9e002505ffa39ad710beff0358 reorganized
ndr_pull_string() so that when we reach this DEBUG(), we don’t yet have
a string to log — ‘as’ will always be NULL. Attempting to log a NULL
string invokes undefined behaviour.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
librpc/ndr/ndr_string.c

index 80054fa9be6ce4c00ceca4ba83469b3da0532990..64a466552065b649a77e270ebf68eec41637e907 100644 (file)
@@ -96,7 +96,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, ndr_flags_type
                                              "Bad string lengths len1=%"PRIu32" ofs=%"PRIu32" len2=%"PRIu32"\n",
                                              len1, ofs, len2);
                } else if (len1 != len2) {
-                       DEBUG(6,("len1[%"PRIu32"] != len2[%"PRIu32"] '%s'\n", len1, len2, as));
+                       DEBUG(6,("len1[%"PRIu32"] != len2[%"PRIu32"]\n", len1, len2));
                }
                conv_src_len = len2 + c_len_term;
                break;