fix(mdns): Address minor review comments

Author: david-cermak

components/mdns/mdns_browser.c

@@ -152,6 +152,7 @@ static mdns_browse_t *browse_init(const char *service, const char *proto, mdns_b
         browse->service = mdns_mem_strndup(service, MDNS_NAME_BUF_LEN - 1);
         if (!browse->service) {
             browse_item_free(browse);
+            HOOK_MALLOC_FAILED;
             return NULL;
         }
     }

components/mdns/mdns_netif.c

@@ -5,8 +5,8 @@
  */
 
 #include <string.h>
+#include "sdkconfig.h"
 #include "esp_log.h"
-#include "esp_check.h"
 #include "esp_event.h"
 #include "mdns.h"
 #include "mdns_private.h"
@@ -66,7 +66,6 @@ static mdns_interfaces_t s_esp_netifs[MDNS_MAX_INTERFACES] = {
 #endif
 };
 
-
 /**
  * @brief  Helper to get either ETH or STA if the other is provided
  *          Used when two interfaces are on the same subnet
@@ -178,7 +177,6 @@ static esp_err_t post_custom_action(mdns_if_t mdns_if, mdns_event_actions_t even
     return ESP_OK;
 }
 
-
 /**
  * @brief  Dispatch interface changes based on system events
  */
@@ -284,7 +282,6 @@ static void handle_system_event_for_preset(void *arg, esp_event_base_t event_bas
 }
 #endif /* CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP || CONFIG_MDNS_PREDEF_NETIF_ETH */
 
-
 static inline void set_default_duplicated_interfaces(void)
 {
     mdns_if_t wifi_sta_if = MDNS_MAX_INTERFACES;
@@ -384,7 +381,6 @@ esp_err_t mdns_priv_netif_deinit(void)
 /*
  * Public Methods
  * */
-
 esp_err_t mdns_netif_action(esp_netif_t *esp_netif, mdns_event_actions_t event_action)
 {
     return post_custom_action(get_if_from_netif(esp_netif), event_action);

components/mdns/mdns_send.c

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <string.h>
+#include "sdkconfig.h"
 #include "mdns_private.h"
 #include "mdns_send.h"
 #include "mdns_utils.h"

components/mdns/mdns_service.c

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <string.h>
+#include "sdkconfig.h"
 #include "mdns_private.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -258,13 +259,15 @@ static esp_err_t create_task_with_caps(void)
     static StaticTask_t mdns_task_buffer;
 
     s_stack_buffer = mdns_mem_task_malloc(MDNS_SERVICE_STACK_DEPTH);
-    ESP_GOTO_ON_FALSE(s_stack_buffer != NULL, ESP_FAIL, err, TAG, "failed to allocate memory for the mDNS task's stack");
+    ESP_GOTO_ON_FALSE(s_stack_buffer != NULL, ESP_FAIL, alloc_failed, TAG, "failed to allocate memory for the mDNS task's stack");
 
     s_service_task_handle = xTaskCreateStaticPinnedToCore(service_task, "mdns", MDNS_SERVICE_STACK_DEPTH, NULL, MDNS_TASK_PRIORITY, s_stack_buffer, &mdns_task_buffer, MDNS_TASK_AFFINITY);
     ESP_GOTO_ON_FALSE(s_service_task_handle != NULL, ESP_FAIL, err, TAG, "failed to create task for the mDNS");
 
     return ret;
 
+alloc_failed:
+    HOOK_MALLOC_FAILED;
 err:
     mdns_mem_task_free(s_stack_buffer);
     return ret;

components/mdns/mdns_utils.c

@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <string.h>
+#include "sdkconfig.h"
 #include "mdns_private.h"
 #include "mdns_mem_caps.h"
 #include "esp_log.h"
 #include "mdns_utils.h"
 #include "mdns_responder.h"
 
+static const char *TAG = "mdns_utils";
 static const char *MDNS_DEFAULT_DOMAIN = "local";
 static const char *MDNS_SUB_STR = "_sub";
 
@@ -119,7 +121,7 @@ bool mdns_utils_hostname_is_ours(const char *hostname)
 bool mdns_utils_service_match(const mdns_service_t *srv, const char *service, const char *proto,
                               const char *hostname)
 {
-    if (!service || !proto || !srv->hostname) {
+    if (!service || !proto || !srv || !srv->hostname) {
         return false;
     }
     return !strcasecmp(srv->service, service) && !strcasecmp(srv->proto, proto) &&
@@ -164,7 +166,7 @@ bool mdns_utils_service_match_instance(const mdns_service_t *srv, const char *in
     if (!service || !proto) {
         return false;
     }
-    // instance==NULL -> _mdns_instance_name_match() will check the default instance
+    // instance==NULL -> mdns_utils_instance_name_match() will check the default instance
     // hostname==NULL -> matches if instance, service and proto matches
     return !strcasecmp(srv->service, service) && mdns_utils_instance_name_match(srv->instance, instance) &&
            !strcasecmp(srv->proto, proto) && (mdns_utils_str_null_or_empty(hostname) || !strcasecmp(srv->hostname, hostname));
@@ -216,6 +218,7 @@ mdns_ip_addr_t *mdns_utils_copy_address_list(const mdns_ip_addr_t *address_list)
     while (address_list != NULL) {
         mdns_ip_addr_t *addr = (mdns_ip_addr_t *)mdns_mem_malloc(sizeof(mdns_ip_addr_t));
         if (addr == NULL) {
+            HOOK_MALLOC_FAILED;
             mdns_utils_free_address_list(head);
             return NULL;
         }

components/mdns/private_include/mdns_private.h

@@ -140,7 +140,7 @@
 #define queueFree(type, queue)  while (queue) { type * _q = queue; queue = queue->next; free(_q); }
 
 #ifndef HOOK_MALLOC_FAILED
-#define HOOK_MALLOC_FAILED  do { ESP_LOGE(TAG, "Cannot allocate memory (line: %d, free heap: %" PRIu32 " bytes)", __LINE__, esp_get_free_heap_size()); } while(0)
+#define HOOK_MALLOC_FAILED  do { ESP_LOGE(TAG, "Cannot allocate memory (%s(%d), free heap: %" PRIu32 " bytes)", __func__, __LINE__, esp_get_free_heap_size()); } while(0)
 #endif
 
 typedef size_t mdns_if_t;