svn commit: samba r13876 - in trunk/source/nmbd: .

jra at samba.org jra at samba.org
Mon Mar 6 17:47:30 GMT 2006


Author: jra
Date: 2006-03-06 17:47:29 +0000 (Mon, 06 Mar 2006)
New Revision: 13876

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

Log:
Fix coverity bug #148. Deref of rrec before NULL check.
Jeremy.

Modified:
   trunk/source/nmbd/nmbd_winsproxy.c


Changeset:
Modified: trunk/source/nmbd/nmbd_winsproxy.c
===================================================================
--- trunk/source/nmbd/nmbd_winsproxy.c	2006-03-06 17:47:21 UTC (rev 13875)
+++ trunk/source/nmbd/nmbd_winsproxy.c	2006-03-06 17:47:29 UTC (rev 13876)
@@ -49,7 +49,12 @@
 
 	nb_flags = get_nb_flags( rrec->rdata );
 
-	num_ips = rrec->rdlength / 6;
+	if (rrec) {
+		num_ips = rrec->rdlength / 6;
+	} else {
+		num_ips = 0;
+	}
+
 	if(num_ips == 0) {
 		DEBUG(0,("wins_proxy_name_query_request_success: Invalid number of IP records (0) \
 returned for name %s.\n", nmb_namestr(nmbname) ));
@@ -71,7 +76,7 @@
 
 	/* Add the queried name to the original subnet as a WINS_PROXY_NAME. */
 
-	if(rrec == PERMANENT_TTL) {
+	if(rrec && (rrec == PERMANENT_TTL)) {
 		ttl = lp_max_ttl();
 	}
 



More information about the samba-cvs mailing list