[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5171-ge452955

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  e452955c077a761cbadd27bede8d6844edbb2e5e (commit)
      from  74efc72bca5707ff35df9282c843d62c4cf331c3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit e452955c077a761cbadd27bede8d6844edbb2e5e
Author: Tim Prouty <tprouty at samba.org>
Date:   Thu Mar 26 11:28:37 2009 -0700

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

-----------------------------------------------------------------------

Summary of changes:
 source/libsmb/unexpected.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/unexpected.c b/source/libsmb/unexpected.c
index df4d211..4404b26 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 &&


-- 
Samba Shared Repository