From c8c804140d553dc6df5c189f2bf1dd0d46be940e Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Wed, 17 Aug 2016 21:00:59 +0200 Subject: [PATCH] Fix possible NULL pointer dereference in mdns.c introduced in my last commit --- src/apps/mdns/mdns.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/apps/mdns/mdns.c b/src/apps/mdns/mdns.c index a8e05a52..d6c2b4b2 100644 --- a/src/apps/mdns/mdns.c +++ b/src/apps/mdns/mdns.c @@ -1928,9 +1928,10 @@ err_t mdns_resp_remove_netif(struct netif *netif) { int i; - struct mdns_host* mdns = (struct mdns_host*)netif->client_data[mdns_netif_client_id]; + struct mdns_host* mdns; LWIP_ASSERT("mdns_resp_remove_netif: Null pointer", netif); + mdns = (struct mdns_host*)netif->client_data[mdns_netif_client_id]; LWIP_ERROR("mdns_resp_remove_netif: Not an active netif", (mdns != NULL), return ERR_VAL); for (i = 0; i < MDNS_MAX_SERVICES; i++) { @@ -1974,9 +1975,10 @@ mdns_resp_add_service(struct netif *netif, const char *name, const char *service int i; int slot = -1; struct mdns_service *srv; - struct mdns_host* mdns = (struct mdns_host*)netif->client_data[mdns_netif_client_id]; + struct mdns_host* mdns; LWIP_ASSERT("mdns_resp_add_service: netif != NULL", netif); + mdns = (struct mdns_host*)netif->client_data[mdns_netif_client_id]; LWIP_ERROR("mdns_resp_add_service: Not an mdns netif", (mdns != NULL), return ERR_VAL); LWIP_ERROR("mdns_resp_add_service: Name too long", (strlen(name) <= MDNS_LABEL_MAXLEN), return ERR_VAL);