Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/mdns_crash_free_strdup_3.2_fix' into 'release/v3.2'

Browse source 
mdns: fixed crash on free undefined ptr if strdup is skipped (Backport 3.2 FIX)

See merge request idf/esp-idf!4197
This commit is contained in:
Ivan Grokhotkov 2019-01-30 14:24:12 +08:00
parent e585121011 43a722f0de
commit 807ef53c38
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
components/mdns/mdns.c
View file

@ -2487,15 +2487,19 @@ handle_error :
}
/**
* @brief Duplicate string or return NULL
* @brief Duplicate string or return error
*/
static char * _mdns_strdup_check(const char * in)
static esp_err_t _mdns_strdup_check(char ** out, char * in)
{
if (in && in[0]) {
return strdup(in);
} else {
return NULL;
*out = strdup(in);
if (!*out) {
return ESP_FAIL;
}
return ESP_OK;
}
*out = NULL;
return ESP_OK;
}
/**
@ -2624,11 +2628,10 @@ void mdns_parse_packet(mdns_rx_packet_t * packet)
question->unicast = unicast;
question->type = type;
question->host = _mdns_strdup_check(name->host);
question->service = _mdns_strdup_check(name->service);
question->proto = _mdns_strdup_check(name->proto);
question->domain = _mdns_strdup_check(name->domain);
if (!question->host || !question->service || !question->proto || !question->domain) {
if (_mdns_strdup_check(&(question->host), name->host)
|| _mdns_strdup_check(&(question->service), name->service)
|| _mdns_strdup_check(&(question->proto), name->proto)
|| _mdns_strdup_check(&(question->domain), name->domain)) {
goto clear_rx_packet;
}
}