unit: check return value of malloc

diff --git a/unit/chimera/arg_checks.cpp b/unit/chimera/arg_checks.cpp
index ea1cda153903c035097d8b32b8b2602924c0913b..b9132a318cdbb934829eef1a45d6cd667cc9233c 100644 (file)
--- a/unit/chimera/arg_checks.cpp
+++ b/unit/chimera/arg_checks.cpp
@@ -477,6 +477,7 @@ TEST(HybridArgChecks, AllocScratchBogusScratch) {
     makeDatabase(&db);
 
     ch_scratch_t *blah = (ch_scratch_t *)malloc(100);
+    ASSERT_TRUE(blah != nullptr);
     memset(blah, 0xf0, 100);
     ch_error_t err = ch_alloc_scratch(db, &blah);
     ASSERT_EQ(CH_INVALID, err);
@@ -536,6 +537,7 @@ TEST(HybridArgChecks, DatabaseSizeNoDatabase) {
 TEST(HybridArgChecks, CloneBadScratch) {
     // Try cloning the scratch
     void *local_garbage = malloc(sizeof(garbage));
+    ASSERT_TRUE(local_garbage != nullptr);
     memcpy(local_garbage, garbage, sizeof(garbage));
     ch_scratch_t *cloned = nullptr;
     ch_scratch_t *scratch = (ch_scratch_t *)local_garbage;
@@ -550,6 +552,7 @@ TEST(HybridArgChecks, ScanBadScratch) {
     makeDatabase(&db);
 
     void *local_garbage = malloc(sizeof(garbage));
+    ASSERT_TRUE(local_garbage != nullptr);
     memcpy(local_garbage, garbage, sizeof(garbage));
 
     ch_scratch_t *scratch = (ch_scratch_t *)local_garbage;

diff --git a/unit/hyperscan/arg_checks.cpp b/unit/hyperscan/arg_checks.cpp
index 2cbd08426ab0d7ddd72bc35fd07fe2a1dd25a5bb..21c8707f65f7df7485dad6f207e8034c827b765f 100644 (file)
--- a/unit/hyperscan/arg_checks.cpp
+++ b/unit/hyperscan/arg_checks.cpp
@@ -1370,6 +1370,7 @@ TEST(HyperscanArgChecks, AllocScratchBogusScratch) {
     ASSERT_EQ(HS_SUCCESS, err);
     ASSERT_TRUE(db != nullptr);
     hs_scratch_t *blah = (hs_scratch_t *)malloc(100);
+    ASSERT_TRUE(blah != nullptr);
     memset(blah, 0xf0, 100);
     err = hs_alloc_scratch(db, &blah);
     ASSERT_EQ(HS_INVALID, err);
@@ -2034,6 +2035,7 @@ TEST(HyperscanArgChecks, ScratchSizeBadScratch) {
 TEST(HyperscanArgChecks, CloneBadScratch) {
     // Try cloning the scratch
     void *local_garbage = malloc(sizeof(garbage));
+    ASSERT_TRUE(local_garbage != nullptr);
     memcpy(local_garbage, garbage, sizeof(garbage));
     hs_scratch_t *cloned = nullptr;
     hs_scratch_t *scratch = (hs_scratch_t *)local_garbage;
@@ -2052,6 +2054,7 @@ TEST(HyperscanArgChecks, ScanBadScratch) {
     ASSERT_TRUE(db != nullptr);
 
     void *local_garbage = malloc(sizeof(garbage));
+    ASSERT_TRUE(local_garbage != nullptr);
     memcpy(local_garbage, garbage, sizeof(garbage));
 
     hs_scratch_t *scratch = (hs_scratch_t *)local_garbage;
@@ -2072,6 +2075,7 @@ TEST(HyperscanArgChecks, ScanStreamBadScratch) {
     ASSERT_EQ(HS_SUCCESS, err);
     ASSERT_TRUE(db != nullptr);
     void *local_garbage = malloc(sizeof(garbage));
+    ASSERT_TRUE(local_garbage != nullptr);
     memcpy(local_garbage, garbage, sizeof(garbage));
     hs_scratch_t *scratch = (hs_scratch_t *)local_garbage;
 
@@ -2107,6 +2111,7 @@ TEST(HyperscanArgChecks, ResetStreamBadScratch) {
     ASSERT_EQ(HS_SUCCESS, err);
     ASSERT_TRUE(db != nullptr);
     void *local_garbage = malloc(sizeof(garbage));
+    ASSERT_TRUE(local_garbage != nullptr);
     memcpy(local_garbage, garbage, sizeof(garbage));
     hs_scratch_t *scratch = (hs_scratch_t *)local_garbage;
 
@@ -2142,6 +2147,7 @@ TEST(HyperscanArgChecks, ScanVectorBadScratch) {
     ASSERT_EQ(HS_SUCCESS, err);
     ASSERT_TRUE(db != nullptr);
     void *local_garbage = malloc(sizeof(garbage));
+    ASSERT_TRUE(local_garbage != nullptr);
     memcpy(local_garbage, garbage, sizeof(garbage));
     hs_scratch_t *scratch = (hs_scratch_t *)local_garbage;