diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2020-07-13 10:24:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-13 10:24:23 +0200 |
| commit | 9d8717a0c7a9bdddb4830f69da58d0dba4b425e2 (patch) | |
| tree | 5b7ff5a19d286a99d55df2b039c1ee62475c5c99 | |
| parent | 9d35364ef103be7c7895bb277b601086bb7ff104 (diff) | |
| parent | 35f1c362b9c005a1094f19cd4cdf5039e5e887d5 (diff) | |
Merge pull request #963 from yskcg/dev
add improved boundary check and check malloc return is NULL
| -rw-r--r-- | example/ndpiReader.c | 8 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c index b0874bc8e..faf5d5508 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -2943,6 +2943,9 @@ static void ndpi_process_packet(u_char *args, /* allocate an exact size buffer to check overflows */ uint8_t *packet_checked = malloc(header->caplen); + if(packet_checked == NULL){ + return ; + } memcpy(packet_checked, packet, header->caplen); p = ndpi_workflow_process_packet(ndpi_thread_info[thread_id].workflow, header, packet_checked, csv_fp); @@ -3047,7 +3050,10 @@ static void ndpi_process_packet(u_char *args, Leave the free as last statement to avoid crashes when ndpi_detection_giveup() is called above by printResults() */ - free(packet_checked); + if(packet_checked){ + free(packet_checked); + packet_checked = NULL; + } } /** diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 199c34a5b..976c8ae83 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -4928,7 +4928,7 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str, packet->line[packet->parsed_lines].len = 0; for (a = 0; ((a+1) < packet->payload_packet_len) && (packet->parsed_lines < NDPI_MAX_PARSE_LINES_PER_PACKET); a++) { - if((packet->payload[a] == 0x0d) && (packet->payload[a+1] == 0x0a)) { + if(((a + 1) < packet->payload_packet_len) &&(packet->payload[a] == 0x0d) && (packet->payload[a+1] == 0x0a)) { /* If end of line char sequence CR+NL "\r\n", process line */ if(((a + 3) < packet->payload_packet_len) |