move to SAFE_FREE()

(This used to be commit 1446a1562b1c618c023b056f476e26da7ee3d532)

1 files changed, 7 insertions, 9 deletions

diff --git a/source3/nmbd/nmbd_namelistdb.c b/source3/nmbd/nmbd_namelistdb.c
index 281197df65..fe2c0c0f21 100644
--- a/source3/nmbd/nmbd_namelistdb.c
+++ b/source3/nmbd/nmbd_namelistdb.c
@@ -78,9 +78,8 @@ static void update_name_in_namelist( struct subnet_record *subrec,
   (void)ubi_trInsert( subrec->namelist, namerec, &(namerec->name), &oldrec );
   if( oldrec )
     {
-    if( oldrec->data.ip )
-      free( oldrec->data.ip );
-    free( oldrec );
+    SAFE_FREE( oldrec->data.ip );
+    SAFE_FREE( oldrec );
     }
   } /* update_name_in_namelist */
 
@@ -93,11 +92,10 @@ void remove_name_from_namelist( struct subnet_record *subrec,
   {
   (void)ubi_trRemove( subrec->namelist, namerec );
 
-  if(namerec->data.ip != NULL)
-    free((char *)namerec->data.ip);
+  SAFE_FREE(namerec->data.ip);
 
   ZERO_STRUCTP(namerec);
-  free((char *)namerec);
+  SAFE_FREE(namerec);
 
   subrec->namelist_changed = True;
   } /* remove_name_from_namelist */
@@ -206,7 +204,7 @@ struct name_record *add_name_to_subnet( struct subnet_record *subrec,
      DEBUG( 0, ( "add_name_to_subnet: malloc fail when creating ip_flgs.\n" ) );
 
      ZERO_STRUCTP(namerec);
-     free( (char *)namerec );
+     SAFE_FREE(namerec);
      return NULL;
   }
 
@@ -353,7 +351,7 @@ void add_ip_to_name_record( struct name_record *namerec, struct in_addr new_ip )
           namerec->data.num_ips * sizeof(struct in_addr) );
   new_list[namerec->data.num_ips] = new_ip;
 
-  free((char *)namerec->data.ip);
+  SAFE_FREE(namerec->data.ip);
   namerec->data.ip = new_list;
   namerec->data.num_ips += 1;
 
@@ -520,7 +518,7 @@ void add_samba_names_to_subnet( struct subnet_record *subrec )
                            PERMANENT_NAME, num_ips, iplist);
 
   if(iplist != &subrec->myip)
-    free((char *)iplist);
+    SAFE_FREE(iplist);
 }
 
 /****************************************************************************