CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-27 03:48:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Migrated remaining *alloc() calls to safe_*alloc()

Browse source
This commit is contained in:
bmenrigh 2008-06-22 04:56:02 +00:00
parent 404c0848bf
commit dea5974643
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nse_nsock.cc
View file

@ -1187,7 +1187,7 @@ void ncap_request_set_result(nsock_event nse, struct ncap_request *nr) {
size_t l2_len, l3_len, packet_len;
nse_readpcap(nse, &l2_data, &l2_len, &l3_data, &l3_len,
&packet_len, NULL);
char *packet = (char*) malloc(l2_len + l3_len);
char *packet = (char*) safe_malloc(l2_len + l3_len);
nr->r_layer2 = (unsigned char*)memcpy(&packet[0], l2_data, l2_len);
nr->r_layer3 = (unsigned char*)memcpy(&packet[l2_len], l3_data, l3_len);
nr->r_layer2_len = l2_len;

14
portreasons.cc
View file

@ -237,12 +237,9 @@ static int update_state_summary(state_reason_summary_t *head, reason_t reason_id
}
if(tmp->next == NULL) {
if((tmp->next = (state_reason_summary_t *)malloc(sizeof(state_reason_summary_t))) == NULL) {
perror("malloc() -> Cannot allocate state reason structures");
return -1;
}
tmp = tmp->next;
break;
tmp->next = (state_reason_summary_t *)safe_malloc(sizeof(state_reason_summary_t));
tmp = tmp->next;
break;
}
tmp = tmp->next;
}
@ -277,10 +274,7 @@ static unsigned int get_state_summary(state_reason_summary_t *head, PortList *Po
static state_reason_summary_t *print_state_summary_internal(PortList *Ports, int state) {
state_reason_summary_t *reason_head;
if((reason_head = (state_reason_summary_t *)malloc(sizeof(state_reason_summary_t))) == NULL) {
perror("malloc() -> Cannot allocate state reason structures");
return NULL;
}
reason_head = (state_reason_summary_t *)safe_malloc(sizeof(state_reason_summary_t));
state_reason_summary_init(reason_head);