From 8ae512478a315acaff73005b55ef305c0c3fec8b Mon Sep 17 00:00:00 2001 From: david Date: Wed, 1 Jul 2009 23:06:41 +0000 Subject: [PATCH] Reorganize some code to make it clear what assignments are happening. This was slightly tricky and caused Coverity to false report a memory leak. --- nse_nsock.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nse_nsock.cc b/nse_nsock.cc index b4ec588e3..d1dc5f225 100644 --- a/nse_nsock.cc +++ b/nse_nsock.cc @@ -1646,8 +1646,10 @@ void ncap_request_set_result(nsock_event nse, struct ncap_request *nr) &packet_len, NULL); 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 = (unsigned char *) packet; + memcpy(nr->r_layer2, l2_data, l2_len); + nr->r_layer3 = (unsigned char *) (packet + l2_len); + memcpy(nr->r_layer3, l3_data, l3_len); nr->r_layer2_len = l2_len; nr->r_layer3_len = l3_len; nr->packetsz = packet_len;