From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Sat, 16 Jun 2018 12:25:06 +0000 (+0200)
Subject: Add two EXTRACT_U_1() macro calls
X-Git-Tag: tcpdump-4.99-bp~1134
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/3b0b3f0defacff248bfe0cafe0da6fcc0a13c008

Add two EXTRACT_U_1() macro calls
---

diff --git a/smbutil.c b/smbutil.c
index 0d64bd38..4fd45568 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -235,11 +235,11 @@ name_len(netdissect_options *ndo,
     c = EXTRACT_U_1(s);
     if ((c & 0xC0) == 0xC0)
 	return(2);
-    while (*s) {
+    while (EXTRACT_U_1(s)) {
 	if (s >= maxbuf)
 	    return(-1);	/* name goes past the end of the buffer */
 	ND_TCHECK_1(s);
-	s += (*s) + 1;
+	s += EXTRACT_U_1(s) + 1;
 	ND_TCHECK_1(s);
     }
     return(PTR_DIFF(s, s0) + 1);