OSDN Git Service

test: add null check assertions to object_heap tests
authorU. Artie Eoff <ullysses.a.eoff@intel.com>
Wed, 29 Nov 2017 19:26:59 +0000 (11:26 -0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Thu, 30 Nov 2017 19:10:49 +0000 (11:10 -0800)
Ensure objects are not NULL before dereferencing.

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
test/object_heap_test.cpp

index 89fd8d7..97a1c92 100644 (file)
@@ -187,8 +187,10 @@ TEST(ObjectHeapTest, DataIntegrity)
         int id = object_heap_allocate(&heap);
         object_base_p base = object_heap_lookup(&heap, id);
         test_object_p object = (test_object_p)base;
-        object->i = std::rand();
-        values.push_back(object->i);
+        if (object) {
+            object->i = std::rand();
+            values.push_back(object->i);
+        }
         return object;
     };
 
@@ -198,7 +200,9 @@ TEST(ObjectHeapTest, DataIntegrity)
     ASSERT_EQ(objects.size(), values.size());
 
     auto validator = [&](test_object_p object) {
+        ASSERT_TRUE(object != NULL);
         object_base_p base = object_heap_lookup(&heap, object->base.id);
+        ASSERT_TRUE(base != NULL);
         EXPECT_TRUE(&object->base == base);
         EXPECT_EQ(object->base.id, base->id);
         test_object_p lo = (test_object_p)base;