detect-http2: call correct free functon on errors

Fix cases where the wrong free function was being called in error
handlers.

Author: jasonish

src/detect-engine-uint.h

@@ -42,6 +42,9 @@ typedef DetectUintData_u32 DetectU32Data;
 typedef DetectUintData_u16 DetectU16Data;
 typedef DetectUintData_u8 DetectU8Data;
 
+typedef DetectUintArrayData_u8 DetectU8ArrayData;
+typedef DetectUintArrayData_u32 DetectU32ArrayData;
+
 int DetectU64Match(const uint64_t parg, const DetectUintData_u64 *du64);
 DetectUintData_u64 *DetectU64Parse(const char *u64str);
 

src/detect-http2.c

@@ -345,13 +345,13 @@ static int DetectHTTP2prioritySetup (DetectEngineCtx *de_ctx, Signature *s, cons
     if (SCDetectSignatureSetAppProto(s, ALPROTO_HTTP2) != 0)
         return -1;
 
-    DetectU8Data *prio = SCDetectU8ArrayParse(str);
+    DetectU8ArrayData *prio = SCDetectU8ArrayParse(str);
     if (prio == NULL)
         return -1;
 
     if (SCSigMatchAppendSMToList(de_ctx, s, DETECT_HTTP2_PRIORITY, (SigMatchCtx *)prio,
                 g_http2_match_buffer_id) == NULL) {
-        SCDetectU8Free(prio);
+        SCDetectU8ArrayFree(prio);
         return -1;
     }
 
@@ -397,14 +397,14 @@ static int DetectHTTP2windowSetup (DetectEngineCtx *de_ctx, Signature *s, const
     if (SCDetectSignatureSetAppProto(s, ALPROTO_HTTP2) != 0)
         return -1;
 
-    DetectU32Data *wu = SCDetectU32ArrayParse(str);
+    DetectU32ArrayData *wu = SCDetectU32ArrayParse(str);
     if (wu == NULL)
         return -1;
 
     // use g_http2_complete_buffer_id as we may have window changes in any state
     if (SCSigMatchAppendSMToList(de_ctx, s, DETECT_HTTP2_WINDOW, (SigMatchCtx *)wu,
                 g_http2_complete_buffer_id) == NULL) {
-        SCDetectU32Free(wu);
+        SCDetectU32ArrayFree(wu);
         return -1;
     }
 
@@ -450,13 +450,13 @@ static int DetectHTTP2sizeUpdateSetup (DetectEngineCtx *de_ctx, Signature *s, co
     if (SCDetectSignatureSetAppProto(s, ALPROTO_HTTP2) != 0)
         return -1;
 
-    void *su = SCDetectU64Parse(str);
+    DetectU64Data *su = SCDetectU64Parse(str);
     if (su == NULL)
         return -1;
 
     if (SCSigMatchAppendSMToList(de_ctx, s, DETECT_HTTP2_SIZEUPDATE, (SigMatchCtx *)su,
                 g_http2_match_buffer_id) == NULL) {
-        DetectHTTP2settingsFree(NULL, su);
+        SCDetectU64Free(su);
         return -1;
     }