no check for pointer!=NULL before dereferencing it

punpack can return NULL. These unit tests were checking if elements
inside of the return value are NULL, but not if the pointer itself
is NULL.

Additionally, a NULL check is unnecessary for a free.

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@665 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/tests/check_check_pack.c b/tests/check_check_pack.c
index 48169a661afa65413ffe44faf466ada77d715502..fe974241be65e495b23d3139c5f1a208ade0bab8 100644 (file)
--- a/tests/check_check_pack.c
+++ b/tests/check_check_pack.c
@@ -270,7 +270,7 @@ START_TEST(test_ppack_onlyctx)
   close (filedes[1]);
   rmsg = punpack (filedes[0]);
 
-  ck_assert_msg (rmsg->msg == NULL,
+  ck_assert_msg (rmsg != NULL && rmsg->msg == NULL,
               "Result message should be NULL with only CTX");
   ck_assert_msg (rmsg->fixture_line == -1,
               "Result loc line should be -1 with only CTX");
@@ -305,13 +305,13 @@ START_TEST(test_ppack_multictx)
   close (filedes[1]);
   rmsg = punpack (filedes[0]);
 
-  ck_assert_msg (rmsg->test_line == 5,
+  ck_assert_msg (rmsg != NULL && rmsg->test_line == 5,
               "Test loc not being preserved on CTX change");
 
   ck_assert_msg (rmsg->fixture_line == -1,
               "Fixture not reset on CTX change");
-  if (rmsg != NULL)
-    free (rmsg);
+
+  free (rmsg);
 }
 END_TEST
 
@@ -333,10 +333,10 @@ START_TEST(test_ppack_nofail)
   close (filedes[1]);
   rmsg = punpack (filedes[0]);
 
-  ck_assert_msg (rmsg->msg == NULL,
+  ck_assert_msg (rmsg != NULL && rmsg->msg == NULL,
               "Failure result should be NULL with no failure message");
-  if (rmsg != NULL)
-    free (rmsg);
+  
+  free (rmsg);
 }
 END_TEST