if (nodup)
my_netbios_names[namecount++] = nbname;
else
- free(nbname);
+ SAFE_FREE(nbname);
ptr++;
}
*/
static void remove_lmb_browser_entry( struct browse_cache_record *browc )
{
- free( (char *)ubi_dlRemThis( lmb_browserlist, browc ) );
+ safe_free( ubi_dlRemThis( lmb_browserlist, browc ) );
} /* remove_lmb_browser_entry */
/* ************************************************************************** **
if (!success && bcast)
{
- if((prdata != rdata) && (prdata != NULL))
- free(prdata);
+ if(prdata != rdata)
+ SAFE_FREE(prdata);
return; /* Never reply with a negative response to broadcasts. */
}
if(!success && !bcast && nmb->header.nm_flags.recursion_desired)
{
- if((prdata != rdata) && (prdata != NULL))
- free(prdata);
+ if(prdata != rdata)
+ SAFE_FREE(prdata);
return;
}
prdata, /* data to send. */
reply_data_len); /* data length. */
- if((prdata != rdata) && (prdata != NULL))
- free(prdata);
+ if(prdata != rdata)
+ SAFE_FREE(prdata);
}
(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 */
{
(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 */
DEBUG( 0, ( "add_name_to_subnet: malloc fail when creating ip_flgs.\n" ) );
ZERO_STRUCTP(namerec);
- free( (char *)namerec );
+ SAFE_FREE(namerec);
return NULL;
}
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;
PERMANENT_NAME, num_ips, iplist);
if(iplist != &subrec->myip)
- free((char *)iplist);
+ SAFE_FREE(iplist);
}
/****************************************************************************
DEBUG(0,("multihomed_register_name: Failed to send packet trying to \
register name %s IP %s\n", nmb_namestr(nmbname), inet_ntoa(ip_list[i]) ));
- free((char *)ip_list);
+ SAFE_FREE(ip_list);
return True;
}
}
- free((char *)ip_list);
+ SAFE_FREE(ip_list);
return False;
}
*listen_number = (count*2) + 2;
- if (*ppset) free(*ppset);
- if (*psock_array) free(*psock_array);
+ SAFE_FREE(*ppset);
+ SAFE_FREE(*psock_array);
*ppset = pset;
*psock_array = sock_array;
q += 2; /* LMNT token (0xff) */
q += 2; /* LM20 token (0xff) */
- free(db_info); /* Not sure whether we need to do anything
+ SAFE_FREE(db_info); /* Not sure whether we need to do anything
useful with these */
/* Send message to smbd */
(*rrec->userdata->free_fn)(rrec->userdata);
} else {
ZERO_STRUCTP(rrec->userdata);
- free((char *)rrec->userdata);
+ SAFE_FREE(rrec->userdata);
}
}
free_packet(rrec->packet);
ZERO_STRUCTP(rrec);
- free((char *)rrec);
+ SAFE_FREE(rrec);
num_response_packets--; /* count of total number of packets still around */
}
{
DEBUG(0,("make_response_queue_record: copy fail for userdata.\n"));
ZERO_STRUCTP(rrec);
- free(rrec);
+ SAFE_FREE(rrec);
return NULL;
}
}
{
DEBUG(0,("make_response_queue_record: malloc fail for userdata.\n"));
ZERO_STRUCTP(rrec);
- free(rrec);
+ SAFE_FREE(rrec);
return NULL;
}
rrec->userdata->copy_fn = userdata->copy_fn;
work->serverlist = servrec->next;
ZERO_STRUCTP(servrec);
- free((char *)servrec);
+ SAFE_FREE(servrec);
}
work->serverlist = servrec->next;
ZERO_STRUCTP(servrec);
- free((char *)servrec);
+ SAFE_FREE(servrec);
work->subnet->work_changed = True;
}
close(nmb_sock);
close(dgram_sock);
ZERO_STRUCTP(subrec);
- free((char *)subrec);
+ SAFE_FREE(subrec);
return(NULL);
}
complete_sync(s);
DLIST_REMOVE(syncs, s);
ZERO_STRUCTP(s);
- free(s);
+ SAFE_FREE(s);
}
}
}
WINS_PROXY_NAME, num_ips, iplist );
if(iplist != &ip)
- free((char *)iplist);
+ SAFE_FREE(iplist);
/*
* Check that none of the IP addresses we are returning is on the
/* Do a deep copy of the packet. */
if((copy_of_p = copy_packet(p)) == NULL)
{
- free((char *)new_userdata);
+ SAFE_FREE(new_userdata);
return NULL;
}
free_packet(p);
ZERO_STRUCTP(userdata);
- free((char *)userdata);
+ SAFE_FREE(userdata);
}
/****************************************************************************
if(nb_flags_str[strlen(nb_flags_str)-1] == 'S')
{
DEBUG(5,("initialise_wins: Ignoring SELF name %s\n", line));
- free((char *)ip_list);
+ SAFE_FREE(ip_list);
continue;
}
name, type, ttl, inet_ntoa(ip_list[0]), nb_flags));
}
- free((char *)ip_list);
+ SAFE_FREE(ip_list);
}
x_fclose(fp);
prdata, /* data to send. */
num_ips*6); /* data length. */
- free(prdata);
+ SAFE_FREE(prdata);
}
/****************************************************************************
prdata, /* data to send. */
reply_data_len); /* data length. */
- if((prdata != rdata) && (prdata != NULL))
- free(prdata);
+ if(prdata != rdata)
+ SAFE_FREE(prdata);
}
/***********************************************************************
subrec->workgrouplist = work->next;
ZERO_STRUCTP(work);
- free((char *)work);
+ SAFE_FREE(work);
}
subrec->work_changed = True;