From: Philippe Antoine <pantoine@oisf.net>
Date: Tue, 7 Jan 2025 12:57:25 +0000 (+0100)
Subject: detect: move fields around to fill memory holes
X-Git-Tag: suricata-8.0.0-beta1~613
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cec270598b90d2fa54a09dc38a41846250926cb;p=thirdparty%2Fsuricata.git

detect: move fields around to fill memory holes

to make scan-build happy avoiding its warning :

Excessive padding in 'struct DetectEngineThreadCtx_'
(33 padding bytes, where 1 is optimal)
---

diff --git a/src/detect.h b/src/detect.h
index b0147e552f..ea81092487 100644
--- a/src/detect.h
+++ b/src/detect.h
@@ -1137,9 +1137,6 @@ typedef struct DetectEngineThreadCtx_ {
     /* byte_* values */
     uint64_t *byte_values;
 
-    uint8_t *base64_decoded;
-    int base64_decoded_len;
-
     /* counter for the filestore array below -- up here for cache reasons. */
     uint16_t filestore_cnt;
 
@@ -1181,6 +1178,9 @@ typedef struct DetectEngineThreadCtx_ {
                                         on a frame is complete. */
     Packet *p;
 
+    uint8_t *base64_decoded;
+    int base64_decoded_len;
+
     uint16_t alert_queue_size;
     uint16_t alert_queue_capacity;
     PacketAlert *alert_queue;