From a26a2e13404d27a4f6d2ec92cd530bd35168659d Mon Sep 17 00:00:00 2001
From: Simon Goldschmidt <goldsimon@gmx.de>
Date: Tue, 12 Jun 2018 13:47:13 +0200
Subject: [PATCH] adapt unit tests to additional NULL checks

---
 test/unit/etharp/test_etharp.c | 11 ++++++++++-
 test/unit/ip6/test_ip6.c       | 11 ++++++++++-
 test/unit/tcp/test_tcp.c       | 11 +++++++----
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/test/unit/etharp/test_etharp.c b/test/unit/etharp/test_etharp.c
index 8eb506c1..86370aa0 100644
--- a/test/unit/etharp/test_etharp.c
+++ b/test/unit/etharp/test_etharp.c
@@ -32,6 +32,15 @@ etharp_remove_all(void)
   }
 }
 
+static err_t
+dummy_input_function(struct pbuf *p, struct netif *inp)
+{
+  LWIP_UNUSED_ARG(p);
+  LWIP_UNUSED_ARG(inp);
+  fail("this netif should have no input");
+  return ERR_VAL;
+}
+
 static err_t
 default_netif_linkoutput(struct netif *netif, struct pbuf *p)
 {
@@ -62,7 +71,7 @@ default_netif_add(void)
 
   fail_unless(netif_default == NULL);
   netif_set_default(netif_add(&test_netif, &test_ipaddr, &test_netmask,
-                              &test_gw, NULL, default_netif_init, NULL));
+                              &test_gw, NULL, default_netif_init, dummy_input_function));
   netif_set_up(&test_netif);
 }
 
diff --git a/test/unit/ip6/test_ip6.c b/test/unit/ip6/test_ip6.c
index d7de039c..7eaa78a6 100644
--- a/test/unit/ip6/test_ip6.c
+++ b/test/unit/ip6/test_ip6.c
@@ -16,6 +16,15 @@
 static struct netif test_netif6;
 static int linkoutput_ctr;
 
+static err_t
+dummy_input_function(struct pbuf *p, struct netif *inp)
+{
+  LWIP_UNUSED_ARG(p);
+  LWIP_UNUSED_ARG(inp);
+  fail("this netif should have no input");
+  return ERR_VAL;
+}
+
 static err_t
 default_netif_linkoutput(struct netif *netif, struct pbuf *p)
 {
@@ -42,7 +51,7 @@ default_netif_add(void)
 {
   struct netif *n;
   fail_unless(netif_default == NULL);
-  n = netif_add_noaddr(&test_netif6, NULL, default_netif_init, NULL);
+  n = netif_add_noaddr(&test_netif6, NULL, default_netif_init, dummy_input_function);
   fail_unless(n == &test_netif6);
   netif_set_default(&test_netif6);
 }
diff --git a/test/unit/tcp/test_tcp.c b/test/unit/tcp/test_tcp.c
index ff2e981d..2e88a38c 100644
--- a/test/unit/tcp/test_tcp.c
+++ b/test/unit/tcp/test_tcp.c
@@ -46,14 +46,16 @@ static struct netif *old_netif_default;
 static void
 tcp_setup(void)
 {
+  struct tcp_pcb dummy_pcb; /* we need this for tcp_next_iss() only */
+
   old_netif_list = netif_list;
   old_netif_default = netif_default;
   netif_list = NULL;
   netif_default = NULL;
   /* reset iss to default (6510) */
   tcp_ticks = 0;
-  tcp_ticks = 0 - (tcp_next_iss(NULL) - 6510);
-  tcp_next_iss(NULL);
+  tcp_ticks = 0 - (tcp_next_iss(&dummy_pcb) - 6510);
+  tcp_next_iss(&dummy_pcb);
   tcp_ticks = 0;
 
   test_tcp_timer = 0;
@@ -669,6 +671,7 @@ START_TEST(test_tcp_rto_rexmit_wraparound)
   struct test_tcp_txcounters txcounters;
   struct test_tcp_counters counters;
   struct tcp_pcb* pcb;
+  struct tcp_pcb dummy_pcb_for_iss; /* we need this for tcp_next_iss() only */
   err_t err;
   size_t i;
   u16_t sent_total = 0;
@@ -684,8 +687,8 @@ START_TEST(test_tcp_rto_rexmit_wraparound)
 
   /* create and initialize the pcb */
   tcp_ticks = 0;
-  tcp_ticks = 0 - tcp_next_iss(NULL);
-  tcp_ticks = SEQNO1 - tcp_next_iss(NULL);
+  tcp_ticks = 0 - tcp_next_iss(&dummy_pcb_for_iss);
+  tcp_ticks = SEQNO1 - tcp_next_iss(&dummy_pcb_for_iss);
   pcb = test_tcp_new_counters_pcb(&counters);
   EXPECT_RET(pcb != NULL);
   tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_REMOTE_PORT);