commit 33aa90539a48325e6813f039ff0f68f4baeb0fb2
author Leandro Pereira <leandro.pereira@intel.com> Wed Jun 06 16:24:23 2018 -0700
committer Maureen Helm <maureen.helm@nxp.com> Fri Jun 08 13:07:19 2018 -0500
tree 221f9ef92da7d864d384aff0ab02d6ef76d81d2e
parent a37e037264164738da2984b14fa206157c3abb7b

tests: kernel: fifo_timeout: Do not potentially dereference NULL ptrs

The return value from k_fifo_get() might be NULL in some situations,
so protect against that.

Coverity-ID: 186190
Coverity-ID: 186058
Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>

tests/kernel/fifo/fifo_timeout/src/main.c

diff --git a/tests/kernel/fifo/fifo_timeout/src/main.c b/tests/kernel/fifo/fifo_timeout/src/main.c
index 17b4b9d..0a544a7 100644
--- a/tests/kernel/fifo/fifo_timeout/src/main.c
+++ b/tests/kernel/fifo/fifo_timeout/src/main.c
@@ -194,35 +194,41 @@
 				K_PRIO_PREEMPT(0), K_INHERIT_PERMS, 0);
 
 	for (ii = 0; ii < test_data_size-1; ii++) {
-
 		k_fifo_put(test_data[ii].fifo, get_scratch_packet());
 
 		data = k_fifo_get(&timeout_order_fifo, K_FOREVER);
+		if (!data) {
+			TC_ERROR("thread %d got NULL value from fifo\n", ii);
+			return TC_FAIL;
+		}
 
-		if (data && data->q_order == ii) {
+		if (data->q_order != ii) {
+			TC_ERROR(" *** thread %d woke up, expected %d\n",
+				 data->q_order, ii);
+			return TC_FAIL;
+		}
+
+		if (data->q_order == ii) {
 			TC_PRINT(" thread (q order: %d, t/o: %d, fifo %p)\n",
 				data->q_order, data->timeout, data->fifo);
-		} else {
-			if (data) {
-				TC_ERROR(" *** thread %d woke up, expected %d\n",
-						data->q_order, ii);
-			}
-			return TC_FAIL;
 		}
 	}
 
 	data = k_fifo_get(&timeout_order_fifo, K_FOREVER);
-	if (data && data->q_order == ii) {
-		TC_PRINT(" thread (q order: %d, t/o: %d, fifo %p)\n",
-				data->q_order, data->timeout, data->fifo);
-	} else {
-		if (data) {
-			TC_ERROR(" *** thread %d woke up, expected %d\n",
-					data->q_order, ii);
-		}
+	if (!data) {
+		TC_ERROR("thread %d got NULL value from fifo\n", ii);
 		return TC_FAIL;
 	}
 
+	if (data->q_order != ii) {
+		TC_ERROR(" *** thread %d woke up, expected %d\n",
+			 data->q_order, ii);
+		return TC_FAIL;
+	}
+
+	TC_PRINT(" thread (q order: %d, t/o: %d, fifo %p)\n",
+		 data->q_order, data->timeout, data->fifo);
+
 	return TC_PASS;
 }