From: David Cermak Date: Fri, 25 Jan 2019 16:19:13 +0000 (+0100) Subject: mdns: fixed crash on free undefined ptr after skipped strdup X-Git-Tag: v3.3-beta2~77^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0a8044a16907e642001b883469618a999dbe6db;p=esp-idf mdns: fixed crash on free undefined ptr after skipped strdup Shortcircuit evaluation may cause skip of _mdns_strdup_check of any further question field, which after clear_rx_packet freed undefined memory. Fixes https://ezredmine.espressif.cn:8765/issues/28465 --- diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c index 742c47aeee..c77c9443fa 100644 --- a/components/mdns/mdns.c +++ b/components/mdns/mdns.c @@ -2590,7 +2590,7 @@ void mdns_parse_packet(mdns_rx_packet_t * packet) parsed_packet->discovery = true; mdns_srv_item_t * a = _mdns_server->services; while (a) { - mdns_parsed_question_t * question = (mdns_parsed_question_t *)malloc(sizeof(mdns_parsed_question_t)); + mdns_parsed_question_t * question = (mdns_parsed_question_t *)calloc(1, sizeof(mdns_parsed_question_t)); if (!question) { HOOK_MALLOC_FAILED; goto clear_rx_packet; @@ -2618,7 +2618,7 @@ void mdns_parse_packet(mdns_rx_packet_t * packet) parsed_packet->probe = true; } - mdns_parsed_question_t * question = (mdns_parsed_question_t *)malloc(sizeof(mdns_parsed_question_t)); + mdns_parsed_question_t * question = (mdns_parsed_question_t *)calloc(1, sizeof(mdns_parsed_question_t)); if (!question) { HOOK_MALLOC_FAILED; goto clear_rx_packet;