summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-03-26 11:28:37 -0700
committerKarolin Seeger <kseeger@samba.org>2009-03-27 13:06:56 +0100
commit9e6eeba7935b04ddcba4e1772e9dd2594c134c4f (patch)
tree98095288d8fd226159ce704f4f85cc192a45f751
parent1fc6fb588ac74c704bbdf98199fea74e08962da4 (diff)
downloadsamba-9e6eeba7935b04ddcba4e1772e9dd2594c134c4f.tar.gz
samba-9e6eeba7935b04ddcba4e1772e9dd2594c134c4f.tar.xz
samba-9e6eeba7935b04ddcba4e1772e9dd2594c134c4f.zip
s3: parse_packet can return NULL which is then dereferenced in match_mailslot_name
(cherry picked from commit d097e3f918853cf642c4a51f6ed3a4d8c85d283e)
-rw-r--r--source/libsmb/unexpected.c4
1 files changed, 4 insertions, 0 deletions
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 &&