From 5d600f72d214f6dfdf269107cc4ad1fba6c5b2b7 Mon Sep 17 00:00:00 2001 From: goldsimon Date: Wed, 29 Mar 2017 22:27:00 +0200 Subject: [PATCH] bridgeif_input: check netif != NULL before calling netif_get_client_data() --- src/netif/bridgeif.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/netif/bridgeif.c b/src/netif/bridgeif.c index 3e3ed8c1..361f5978 100644 --- a/src/netif/bridgeif.c +++ b/src/netif/bridgeif.c @@ -481,9 +481,13 @@ bridgeif_input(struct pbuf *p, struct netif *netif) bridgeif_portmask_t dstports; struct eth_addr *src, *dst; bridgeif_private_t *br; - bridgeif_port_t *port = (bridgeif_port_t *)netif_get_client_data(netif, bridgeif_netif_client_id); + bridgeif_port_t *port; + if (p == NULL || netif == NULL) { + return ERR_VAL; + } + port = (bridgeif_port_t *)netif_get_client_data(netif, bridgeif_netif_client_id); LWIP_ASSERT("port data not set", port != NULL); - if (p == NULL || netif == NULL || port == NULL || port->bridge == NULL) { + if (port == NULL || port->bridge == NULL) { return ERR_VAL; } br = (bridgeif_private_t *)port->bridge;