scan-build: fix potential 0 size allocation warnings

diff --git a/src/detect-flowbits.c b/src/detect-flowbits.c
index 75c6c9603f2abf2c70cda85ac6701dc8f044d81c..e4cae2d7e9feb451d65c4ff782e9c6522abc4a5b 100644 (file)
--- a/src/detect-flowbits.c
+++ b/src/detect-flowbits.c
@@ -111,6 +111,10 @@ static int FlowbitOrAddData(DetectEngineCtx *de_ctx, DetectFlowbitsData *cd, cha
     next:
         arrptr = NULL;
     }
+    if (i == 0) {
+        SCLogError("No valid flowbits specified");
+        return -1;
+    }
 
     cd->or_list_size = i;
     cd->or_list = SCCalloc(cd->or_list_size, sizeof(uint32_t));

diff --git a/src/util-pool.c b/src/util-pool.c
index 7d2f37a74e176a31c62a8e28c7a407152a8e5d6f..b8fe4abb4fbceb058155214d3c34f2d7b331786d 100644 (file)
--- a/src/util-pool.c
+++ b/src/util-pool.c
@@ -101,6 +101,10 @@ Pool *PoolInit(uint32_t size, uint32_t prealloc_size, uint32_t elt_size,
         sc_errno = SC_EINVAL;
         goto error;
     }
+    if (elt_size == 0 && Alloc == NULL) {
+        sc_errno = SC_EINVAL;
+        goto error;
+    }
 
     /* setup the filter */
     p = SCMalloc(sizeof(Pool));

diff --git a/src/util-radix-tree.c b/src/util-radix-tree.c
index 654b499e1b0538deddf74ed6f37c94cec364fc56..3d750675af55d3ef5da9d8b6337f67ed9a6a2851 100644 (file)
--- a/src/util-radix-tree.c
+++ b/src/util-radix-tree.c
@@ -133,7 +133,7 @@ static SCRadixPrefix *SCRadixCreatePrefix(uint8_t *key_stream,
 {
     SCRadixPrefix *prefix = NULL;
 
-    if ((key_bitlen % 8 != 0)) {
+    if (key_bitlen == 0 || (key_bitlen % 8 != 0)) {
         SCLogError("Invalid argument bitlen - %d", key_bitlen);
         return NULL;
     }