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

[jra at samba.org]

Author: jra
Date: 2006-06-28 20:38:59 +0000 (Wed, 28 Jun 2006)
New Revision: 16641

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

Log:
Fix show-stopper bug #3876. Double-free in wins
server code. Jerry please merge for 3.0.23.
Jeremy.

Modified:
   trunk/source/nmbd/nmbd_winsserver.c


Changeset:
Modified: trunk/source/nmbd/nmbd_winsserver.c
===================================================================
--- trunk/source/nmbd/nmbd_winsserver.c	2006-06-28 18:56:45 UTC (rev 16640)
+++ trunk/source/nmbd/nmbd_winsserver.c	2006-06-28 20:38:59 UTC (rev 16641)
@@ -76,6 +76,7 @@
 	if (!namerec) {
 		return NULL;
 	}
+	ZERO_STRUCTP(namerec);
 
 	namerec->data.ip = SMB_MALLOC_ARRAY(struct in_addr, num_ips);
 	if (!namerec->data.ip) {
@@ -294,7 +295,6 @@
 	ret = tdb_delete(wins_tdb, key);
 
 	DLIST_REMOVE(wins_server_subnet->namelist, namerec);
-	SAFE_FREE(namerec->data.ip);
 
 	/* namerec must be freed by the caller */