summaryrefslogtreecommitdiffstats
path: root/source/nmbd/nmbd_winsserver.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-06-28 20:39:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:19:05 -0500
commitd354b430ff0473764db8ea492a68d10946dadc23 (patch)
treea802058be4b84bd63a73422d8e8743b62b5f1d49 /source/nmbd/nmbd_winsserver.c
parent76cc25a37e145fb48a8a81df37e790690b5dceac (diff)
downloadsamba-d354b430ff0473764db8ea492a68d10946dadc23.tar.gz
samba-d354b430ff0473764db8ea492a68d10946dadc23.tar.xz
samba-d354b430ff0473764db8ea492a68d10946dadc23.zip
r16642: Fix show-stopper bug #3876. Double-free in wins
server code. Jerry please merge for 3.0.23. Jeremy.
Diffstat (limited to 'source/nmbd/nmbd_winsserver.c')
-rw-r--r--source/nmbd/nmbd_winsserver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/nmbd/nmbd_winsserver.c b/source/nmbd/nmbd_winsserver.c
index 29d5c41de82..86f7fd58502 100644
--- a/source/nmbd/nmbd_winsserver.c
+++ b/source/nmbd/nmbd_winsserver.c
@@ -76,6 +76,7 @@ static struct name_record *wins_record_to_name_record(TDB_DATA key, TDB_DATA dat
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 @@ BOOL remove_name_from_wins_namelist(struct name_record *namerec)
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 */