Merge pull request #2178 from cgundogan/ip_fix_null_check

ip: check for null before ip_get_next_hop is used
RIOT-OS · Dec 11, 2014 · 40264b4 · 40264b4
2 parents 0d6bc7e + 2a7ce79
commit 40264b4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/sys/net/network_layer/sixlowpan/ip.c b/sys/net/network_layer/sixlowpan/ip.c
@@ -106,12 +106,13 @@ int ipv6_send_packet(ipv6_hdr_t *packet, ipv6_addr_t *next_hop)
 
         if (next_hop == NULL) {
             DEBUG("Trying to find the next hop for %s\n", ipv6_addr_to_str(addr_str, IPV6_MAX_ADDR_STR_LEN, &packet->destaddr));
-            ipv6_addr_t *dest = ip_get_next_hop(&packet->destaddr);
 
             if (ip_get_next_hop == NULL) {
                 return -1;
             }
 
+            ipv6_addr_t *dest = ip_get_next_hop(&packet->destaddr);
+
             if (dest == NULL) {
                 return -1;
             }