Просмотр исходного кода

Merge branch 'bugfix/mdns_null_deref_fuzzer_v4.2' into 'release/v4.2'

mdns: Fix potential null deref reported by fuzzer test(v4.2)

See merge request espressif/esp-idf!17145
Zim Kalinowski 4 лет назад
Родитель
Сommit
6f2d77ed2c
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      components/mdns/mdns.c

+ 2 - 1
components/mdns/mdns.c

@@ -2439,7 +2439,8 @@ static bool _mdns_question_matches(mdns_parsed_question_t * question, uint16_t t
     if (type == MDNS_TYPE_A || type == MDNS_TYPE_AAAA) {
         return true;
     } else if (type == MDNS_TYPE_PTR || type == MDNS_TYPE_SDPTR) {
-        if (!strcasecmp(service->service->service, question->service)
+        if (question->service && question->proto && question->domain
+            && !strcasecmp(service->service->service, question->service)
             && !strcasecmp(service->service->proto, question->proto)
             && !strcasecmp(MDNS_DEFAULT_DOMAIN, question->domain)) {
             return true;