]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
c_read_operations.cc: prevent potential null pointer deref
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Thu, 13 Nov 2014 16:29:12 +0000 (17:29 +0100)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Thu, 13 Nov 2014 22:39:10 +0000 (23:39 +0100)
CID 1251575 (#1 of 1): Dereference after null check (FORWARD_NULL)
 var_deref_model: Passing null pointer key to basic_string, which
 dereferences it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/test/librados/c_read_operations.cc

index 33a4675f2e286755af49444f0de8e84b29861f07..d29a27392515aa9b5176c4b17ef6c12b2870ed7b 100644 (file)
@@ -101,7 +101,7 @@ protected:
     while (i < len) {
       ASSERT_EQ(0, rados_getxattrs_next(iter, (const char**) &key,
                                        (const char**) &val, &val_len));
-      if (val_len == 0 && key == NULL && val == NULL)
+      if (key == NULL || (val_len == 0 && val == NULL))
        break;
       EXPECT_EQ(std::string(keys[i]), std::string(key));
       EXPECT_EQ(0, memcmp(vals[i], val, val_len));