Merge branch 'bugfix/mdns_crash_free_strdup' into 'master'

mdns: fixed crash on free undefined ptr if strdup is skipped

See merge request idf/esp-idf!4173
pull/3023/head
Angus Gratton 2019-01-30 09:33:12 +08:00
commit 784fc51931
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -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;