From 7b293a42cd6380e4e4a11ad8a3eec5ee7f7f7eeb Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Mon, 14 Nov 2016 14:25:18 +0100
Subject: [PATCH] fix(network): Check for nullptr values

Ref #159
---
 src/adapters/net.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/adapters/net.cpp b/src/adapters/net.cpp
index 7d3defb7..f20a0f96 100644
--- a/src/adapters/net.cpp
+++ b/src/adapters/net.cpp
@@ -62,7 +62,7 @@ namespace net {
   bool network::query(bool accumulate) {
     struct ifaddrs* ifaddr;
 
-    if (getifaddrs(&ifaddr) == -1)
+    if (getifaddrs(&ifaddr) == -1 || ifaddr == nullptr)
       return false;
 
     m_status.previous = m_status.current;
@@ -71,11 +71,12 @@ namespace net {
     m_status.current.time = chrono::system_clock::now();
 
     for (auto ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next) {
-      if (m_interface.compare(0, m_interface.length(), ifa->ifa_name) != 0) {
-        if (!accumulate || ifa->ifa_addr->sa_family != AF_PACKET) {
+      if (ifa->ifa_data == nullptr || ifa->ifa_addr == nullptr)
+        continue;
+
+      if (m_interface.compare(0, m_interface.length(), ifa->ifa_name) != 0)
+        if (!accumulate || ifa->ifa_addr->sa_family != AF_PACKET)
           continue;
-        }
-      }
 
       switch (ifa->ifa_addr->sa_family) {
         case AF_INET:
@@ -85,9 +86,9 @@ namespace net {
           break;
 
         case AF_PACKET:
-          if (ifa->ifa_data == nullptr)
-            continue;
           struct rtnl_link_stats* link_state = reinterpret_cast<decltype(link_state)>(ifa->ifa_data);
+          if (link_state == nullptr)
+            continue;
           m_status.current.transmitted += link_state->tx_bytes;
           m_status.current.received += link_state->rx_bytes;
           break;