commit 332e8babe350433b320efc9484f15a5dbdd8c68f
author Jean-Baptiste Queru <jbq@google.com> Thu Aug 09 11:24:26 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Thu Aug 09 11:24:27 2012 -0700
tree caebf789623cae0477565131ca5afd8467c9bf09
parent 983ce5738cee0bf78b87d6274fe1387129768302
parent 3f6dfd684dd9451dcc4c83c42068c20753147077

Merge "Avoid dereferencing NULL pointer with memcmp in the test code."

tests/bionic/libc/common/test_libgen.c

diff --git a/tests/bionic/libc/common/test_libgen.c b/tests/bionic/libc/common/test_libgen.c
index 4a2c29e..fd85816 100644
--- a/tests/bionic/libc/common/test_libgen.c
+++ b/tests/bionic/libc/common/test_libgen.c
@@ -76,7 +76,7 @@
             return;
         }
     }
-    else if ( memcmp( _buff, _expected_content, ret ) ) {
+    else if (_buff != NULL && memcmp( _buff, _expected_content, ret ) ) {
         fprintf(stderr,
                 "KO: basename_r(\"%s\", <buff>, %d) returned \"%s\", expected \"%s\"\n",
                 _input, _bufflen, _buff, _expected_content );
@@ -109,7 +109,7 @@
             return;
         }
     }
-    else if ( memcmp( _buff, _expected_content, ret ) ) {
+    else if (_buff != NULL &&  memcmp( _buff, _expected_content, ret ) ) {
         fprintf(stderr,
                 "KO: dirname_r(\"%s\", <buff>, %d) returned \"%s\", expected \"%s\"\n",
                 _input, _bufflen, _buff, _expected_content );