Fixed nullptr dereference in MDNS.c

David Cermak · suren-gabrielyan-espressif · commit ad29d34bb67a · 2022-05-27T17:44:22.000+04:00
* Original commit: espressif/esp-idf@fffbf7b
diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c
@@ -2269,7 +2269,7 @@ static bool _mdns_question_matches(mdns_parsed_question_t * question, uint16_t t
         }
     } else if (type == MDNS_TYPE_SRV || type == MDNS_TYPE_TXT) {
         const char * name = _mdns_get_service_instance_name(service->service);
-        if (name && !strcasecmp(name, question->host)
+        if (name && question->host && !strcasecmp(name, question->host)
             && !strcasecmp(service->service->service, question->service)
             && !strcasecmp(service->service->proto, question->proto)
             && !strcasecmp(MDNS_DEFAULT_DOMAIN, question->domain)) {

Original file line number	Diff line number	Diff line change
`@@ -2269,7 +2269,7 @@ static bool _mdns_question_matches(mdns_parsed_question_t * question, uint16_t t`
`2269`	`2269`	`}`
`2270`	`2270`	`} else if (type == MDNS_TYPE_SRV \|\| type == MDNS_TYPE_TXT) {`
`2271`	`2271`	`const char * name = _mdns_get_service_instance_name(service->service);`
`2272`		`- if (name && !strcasecmp(name, question->host)`
	`2272`	`+ if (name && question->host && !strcasecmp(name, question->host)`
`2273`	`2273`	`&& !strcasecmp(service->service->service, question->service)`
`2274`	`2274`	`&& !strcasecmp(service->service->proto, question->proto)`
`2275`	`2275`	`&& !strcasecmp(MDNS_DEFAULT_DOMAIN, question->domain)) {`