detect/content: cleanup content setup/check code

Pass SigMatch pointer instead of a list id to SigParseRequiredContentSize.

diff --git a/src/detect-bsize.c b/src/detect-bsize.c
index 6639742f8ee4ec69fc05fb68d0fed0c93a91af30..4c89abc3c6a8fcb166b0ab8218f93e92c28b839a 100644 (file)
--- a/src/detect-bsize.c
+++ b/src/detect-bsize.c
@@ -64,7 +64,7 @@ bool DetectBsizeValidateContentCallback(Signature *s, int list)
     uint64_t needed;
     if (bsize >= 0) {
         int len, offset;
-        SigParseRequiredContentSize(s, bsize, list, &len, &offset);
+        SigParseRequiredContentSize(s, bsize, s->init_data->smlists[list], &len, &offset);
         SCLogDebug("bsize: %d; len: %d; offset: %d [%s]", bsize, len, offset, s->sig_str);
         needed = len;
         if (len > bsize) {

diff --git a/src/detect-content.c b/src/detect-content.c
index 891eee523a24a56571c6a904759da15c4c8b036d..a66497d400e39087884eb86612d1cafcf61a1759 100644 (file)
--- a/src/detect-content.c
+++ b/src/detect-content.c
@@ -412,13 +412,8 @@ void DetectContentFree(DetectEngineCtx *de_ctx, void *ptr)
  *  - Negated content values are checked but not accumulated for the required size.
  */
 void SigParseRequiredContentSize(
-        const Signature *s, const int max_size, int list, int *len, int *offset)
+        const Signature *s, const int max_size, const SigMatch *sm, int *len, int *offset)
 {
-    if (list > (int)s->init_data->smlists_array_size) {
-        return;
-    }
-
-    SigMatch *sm = s->init_data->smlists[list];
     int max_offset = 0, total_len = 0;
     bool first = true;
     for (; sm != NULL; sm = sm->next) {

diff --git a/src/detect-content.h b/src/detect-content.h
index ae179ad076d4695be232663ab252cb7b06e5b3ef..d1f3d6fbc1b633e53ab181242695460b6e2e5e4f 100644 (file)
--- a/src/detect-content.h
+++ b/src/detect-content.h
@@ -132,6 +132,6 @@ void DetectContentPropagateLimits(Signature *s);
 
 void DetectContentPatternPrettyPrint(const DetectContentData *cd, char *str, size_t str_len);
 void SigParseRequiredContentSize(
-        const Signature *s, const int max, int list, int *len, int *offset);
+        const Signature *s, const int max, const SigMatch *sm, int *len, int *offset);
 
 #endif /* __DETECT_CONTENT_H__ */

diff --git a/src/detect-dsize.c b/src/detect-dsize.c
index 9d62457fc16fd2b2a14edfc065beeeff7816d352..4336e3546b9fa66334491cb7f819e06b72c4c290 100644 (file)
--- a/src/detect-dsize.c
+++ b/src/detect-dsize.c
@@ -315,7 +315,8 @@ int SigParseMaxRequiredDsize(const Signature *s)
     }
 
     int total_length, offset;
-    SigParseRequiredContentSize(s, dsize, DETECT_SM_LIST_PMATCH, &total_length, &offset);
+    SigParseRequiredContentSize(
+            s, dsize, s->init_data->smlists[DETECT_SM_LIST_PMATCH], &total_length, &offset);
     SCLogDebug("dsize: %d  len: %d; offset: %d [%s]", dsize, total_length, offset, s->sig_str);
 
     if (total_length > dsize) {