From: Victor Julien <vjulien@oisf.net>
Date: Sat, 21 Jan 2023 11:08:51 +0000 (+0100)
Subject: streaming: add sbcfg to StreamingBufferFree
X-Git-Tag: suricata-7.0.0-rc1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e5f35e0a071c870077a42b6f7266abcf6c859ae;p=thirdparty%2Fsuricata.git

streaming: add sbcfg to StreamingBufferFree
---

diff --git a/src/app-layer-htp-body.c b/src/app-layer-htp-body.c
index 3e4ec5b934..4c7dfb49bd 100644
--- a/src/app-layer-htp-body.c
+++ b/src/app-layer-htp-body.c
@@ -138,7 +138,7 @@ void HtpBodyFree(const HTPCfgDir *hcfg, HtpBody *body)
     }
     body->first = body->last = NULL;
 
-    StreamingBufferFree(body->sb);
+    StreamingBufferFree(body->sb, &hcfg->sbcfg);
 }
 
 /**
diff --git a/src/util-file.c b/src/util-file.c
index 321d910a5a..26f0ffb72e 100644
--- a/src/util-file.c
+++ b/src/util-file.c
@@ -593,7 +593,7 @@ static void FileFree(File *ff, const StreamingBufferConfig *sbcfg)
         SCFree(ff->magic);
 #endif
     if (ff->sb != NULL) {
-        StreamingBufferFree(ff->sb);
+        StreamingBufferFree(ff->sb, sbcfg);
     }
 
     if (ff->md5_ctx)
diff --git a/src/util-streaming-buffer.c b/src/util-streaming-buffer.c
index cda020b4bb..8700c6613f 100644
--- a/src/util-streaming-buffer.c
+++ b/src/util-streaming-buffer.c
@@ -177,7 +177,7 @@ void StreamingBufferClear(StreamingBuffer *sb)
     }
 }
 
-void StreamingBufferFree(StreamingBuffer *sb)
+void StreamingBufferFree(StreamingBuffer *sb, const StreamingBufferConfig *cfg)
 {
     if (sb != NULL) {
         StreamingBufferClear(sb);
@@ -1696,7 +1696,7 @@ static int StreamingBufferTest02(void)
     FAIL_IF_NOT_NULL(sb->head);
     FAIL_IF_NOT(sb->head == RB_MIN(SBB, &sb->sbb_tree));
 
-    StreamingBufferFree(sb);
+    StreamingBufferFree(sb, &cfg);
     PASS;
 }
 
@@ -1751,7 +1751,7 @@ static int StreamingBufferTest03(void)
     FAIL_IF_NOT(sb->sbb_size == 12);
     FAIL_IF_NOT(sb->head == RB_MIN(SBB, &sb->sbb_tree));
 
-    StreamingBufferFree(sb);
+    StreamingBufferFree(sb, &cfg);
     PASS;
 }
 
@@ -1841,7 +1841,7 @@ static int StreamingBufferTest04(void)
     FAIL_IF(!StreamingBufferSegmentCompareRawData(sb,&seg3,(const uint8_t *)"QWERTY", 6));
     FAIL_IF(!StreamingBufferSegmentCompareRawData(sb,&seg4,(const uint8_t *)"XYZ", 3));
 
-    StreamingBufferFree(sb);
+    StreamingBufferFree(sb, &cfg);
     PASS;
 }
 
@@ -1899,7 +1899,7 @@ static int StreamingBufferTest06(void)
     FAIL_IF_NOT(sb->sbb_size == 10);
     FAIL_IF_NOT(sb->head == RB_MIN(SBB, &sb->sbb_tree));
 
-    StreamingBufferFree(sb);
+    StreamingBufferFree(sb, &cfg);
     PASS;
 }
 
@@ -1957,7 +1957,7 @@ static int StreamingBufferTest07(void)
     FAIL_IF_NOT(sb->sbb_size == 10);
     FAIL_IF_NOT(sb->head == RB_MIN(SBB, &sb->sbb_tree));
 
-    StreamingBufferFree(sb);
+    StreamingBufferFree(sb, &cfg);
     PASS;
 }
 
@@ -2015,7 +2015,7 @@ static int StreamingBufferTest08(void)
     FAIL_IF_NOT(sb->sbb_size == 20);
     FAIL_IF_NOT(sb->head == RB_MIN(SBB, &sb->sbb_tree));
 
-    StreamingBufferFree(sb);
+    StreamingBufferFree(sb, &cfg);
     PASS;
 }
 
@@ -2073,7 +2073,7 @@ static int StreamingBufferTest09(void)
     FAIL_IF_NOT(sb->sbb_size == 10);
     FAIL_IF_NOT(sb->head == RB_MIN(SBB, &sb->sbb_tree));
 
-    StreamingBufferFree(sb);
+    StreamingBufferFree(sb, &cfg);
     PASS;
 }
 
@@ -2132,7 +2132,7 @@ static int StreamingBufferTest10(void)
     FAIL_IF_NULL(sb->head);
     FAIL_IF_NOT(sb->sbb_size == 10);
 
-    StreamingBufferFree(sb);
+    StreamingBufferFree(sb, &cfg);
     PASS;
 }
 
diff --git a/src/util-streaming-buffer.h b/src/util-streaming-buffer.h
index 7034796d37..bc5182559b 100644
--- a/src/util-streaming-buffer.h
+++ b/src/util-streaming-buffer.h
@@ -158,7 +158,7 @@ typedef struct StreamingBufferSegment_ {
 
 StreamingBuffer *StreamingBufferInit(const StreamingBufferConfig *cfg);
 void StreamingBufferClear(StreamingBuffer *sb);
-void StreamingBufferFree(StreamingBuffer *sb);
+void StreamingBufferFree(StreamingBuffer *sb, const StreamingBufferConfig *cfg);
 
 void StreamingBufferSlideToOffset(
         StreamingBuffer *sb, const StreamingBufferConfig *cfg, uint64_t offset);