diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-08-30 04:27:26 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-08-30 04:27:26 +0000 |
| commit | c5e5c25c854e54f59291057ba47c4701b5910ebe (patch) | |
| tree | db5e5fda202a062e8f7be1791e748d266588ec1d /source/nmbd/nmbd_become_lmb.c | |
| parent | a564e4662711d384069757ce3ee5adcadc1b061d (diff) | |
| download | samba-c5e5c25c854e54f59291057ba47c4701b5910ebe.tar.gz samba-c5e5c25c854e54f59291057ba47c4701b5910ebe.tar.xz samba-c5e5c25c854e54f59291057ba47c4701b5910ebe.zip | |
added some defensive programming to nmbd. This mostly means zeroing
areas of memory before freeing them.
While doing this I also found a couple of real bugs. In two places we
were freeing some memory that came from the stack, which leads to
a certain core dump on many sytems.
Diffstat (limited to 'source/nmbd/nmbd_become_lmb.c')
| -rw-r--r-- | source/nmbd/nmbd_become_lmb.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/nmbd/nmbd_become_lmb.c b/source/nmbd/nmbd_become_lmb.c index 2d007ecd753..3fe6f596fa6 100644 --- a/source/nmbd/nmbd_become_lmb.c +++ b/source/nmbd/nmbd_become_lmb.c @@ -212,9 +212,9 @@ static void release_1d_name( struct subnet_record *subrec, char *workgroup_name, if((namerec = find_name_on_subnet( subrec, &nmbname, FIND_SELF_NAME))!=NULL) { struct userdata_struct *userdata; + int size = sizeof(struct userdata_struct) + sizeof(BOOL); - if((userdata = (struct userdata_struct *)malloc( - sizeof(struct userdata_struct) + sizeof(BOOL))) == NULL) + if((userdata = (struct userdata_struct *)malloc(size)) == NULL) { DEBUG(0,("release_1d_name: malloc fail.\n")); return; @@ -230,7 +230,7 @@ static void release_1d_name( struct subnet_record *subrec, char *workgroup_name, unbecome_local_master_fail, userdata); - free((char *)userdata); + zero_free(userdata, size); } } @@ -526,6 +526,7 @@ void become_local_master_browser(struct subnet_record *subrec, struct work_recor { struct server_record *servrec; struct userdata_struct *userdata; + int size = sizeof(struct userdata_struct) + sizeof(fstring) + 1; /* Sanity check. */ if (!lp_local_master()) @@ -561,7 +562,7 @@ in workgroup %s on subnet %s\n", subrec->work_changed = True; /* Setup the userdata_struct. */ - if((userdata = (struct userdata_struct *)malloc(sizeof(struct userdata_struct) + sizeof(fstring)+1)) == NULL) + if((userdata = (struct userdata_struct *)malloc(size)) == NULL) { DEBUG(0,("become_local_master_browser: malloc fail.\n")); return; @@ -578,7 +579,7 @@ in workgroup %s on subnet %s\n", become_local_master_fail1, userdata); - free((char *)userdata); + zero_free(userdata, size); } /*************************************************************** |