From: Tim Prouty <tprouty@samba.org>
Date: Thu, 26 Mar 2009 18:28:37 +0000 (-0700)
Subject: s3: parse_packet can return NULL which is then dereferenced in match_mailslot_name
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d097e3f918853cf642c4a51f6ed3a4d8c85d283e;p=thirdparty%2Fsamba.git

s3: parse_packet can return NULL which is then dereferenced in match_mailslot_name
---

diff --git a/source/libsmb/unexpected.c b/source/libsmb/unexpected.c
index df4d2119e27..4404b26ccb0 100644
--- a/source/libsmb/unexpected.c
+++ b/source/libsmb/unexpected.c
@@ -163,6 +163,10 @@ static int traverse_match(TDB_CONTEXT *ttdb, TDB_DATA kbuf, TDB_DATA dbuf,
 			ip,
 			port);
 
+	if (!p) {
+		return 0;
+	}
+
 	if ((state->match_type == NMB_PACKET &&
 	     p->packet.nmb.header.name_trn_id == state->match_id) ||
 	    (state->match_type == DGRAM_PACKET &&