From bc2a225e53b8dabec2d0604081dc4e7b9c15c480 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Thu, 21 Jan 2021 10:23:40 +0100 Subject: [PATCH] drivers/at86rf2xx: fix null pointer check check if argument is NULL *before* using it :-) --- drivers/at86rf2xx/at86rf2xx_netdev.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/at86rf2xx/at86rf2xx_netdev.c b/drivers/at86rf2xx/at86rf2xx_netdev.c index fb2d372c6f..7d9f4cd030 100644 --- a/drivers/at86rf2xx/at86rf2xx_netdev.c +++ b/drivers/at86rf2xx/at86rf2xx_netdev.c @@ -305,7 +305,7 @@ netopt_state_t _get_state(at86rf2xx_t *dev) static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len) { - at86rf2xx_t *dev = (at86rf2xx_t *) netdev; + at86rf2xx_t *dev = (at86rf2xx_t *)netdev; if (netdev == NULL) { return -ENODEV; @@ -483,13 +483,12 @@ static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len) static int _set(netdev_t *netdev, netopt_t opt, const void *val, size_t len) { - at86rf2xx_t *dev = (at86rf2xx_t *) netdev; - uint8_t old_state = at86rf2xx_get_status(dev); - int res = -ENOTSUP; - + at86rf2xx_t *dev = (at86rf2xx_t *)netdev; if (dev == NULL) { return -ENODEV; } + uint8_t old_state = at86rf2xx_get_status(dev); + int res = -ENOTSUP; /* temporarily wake up if sleeping and opt != NETOPT_STATE. * opt != NETOPT_STATE check prevents redundant wake-up.