svn commit: samba r13892 - in branches/SAMBA_3_0/source/nmbd: .

[jra at samba.org]

Author: jra
Date: 2006-03-06 20:05:20 +0000 (Mon, 06 Mar 2006)
New Revision: 13892

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13892

Log:
Doh ! My bugfix had a bug :-). Spotted by  Willi Mann <willi at wm1.at>,
if rrec can be null make sure we *never* deref it.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/nmbd/nmbd_winsproxy.c


Changeset:
Modified: branches/SAMBA_3_0/source/nmbd/nmbd_winsproxy.c
===================================================================
--- branches/SAMBA_3_0/source/nmbd/nmbd_winsproxy.c	2006-03-06 20:05:12 UTC (rev 13891)
+++ branches/SAMBA_3_0/source/nmbd/nmbd_winsproxy.c	2006-03-06 20:05:20 UTC (rev 13892)
@@ -47,11 +47,11 @@
 	memcpy( (char *)&original_packet, &userdata->data[sizeof(struct subnet_record *)],
 			sizeof(struct packet_struct *) );
 
-	nb_flags = get_nb_flags( rrec->rdata );
-
 	if (rrec) {
+		nb_flags = get_nb_flags( rrec->rdata );
 		num_ips = rrec->rdlength / 6;
 	} else {
+		nb_flags = 0;
 		num_ips = 0;
 	}