From dea59746430358593dccb9491d0c07d4484a11c6 Mon Sep 17 00:00:00 2001 From: bmenrigh Date: Sun, 22 Jun 2008 04:56:02 +0000 Subject: [PATCH] Migrated remaining *alloc() calls to safe_*alloc() --- nse_nsock.cc | 2 +- portreasons.cc | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/nse_nsock.cc b/nse_nsock.cc index 23ca643aa..266af3888 100644 --- a/nse_nsock.cc +++ b/nse_nsock.cc @@ -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; diff --git a/portreasons.cc b/portreasons.cc index df492f976..8c9459d8e 100644 --- a/portreasons.cc +++ b/portreasons.cc @@ -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);