Index: nmbd/nmbd_winsserver.c
===================================================================
--- nmbd/nmbd_winsserver.c	(revision 16640)
+++ nmbd/nmbd_winsserver.c	(working copy)
@@ -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 */