Figure out sig fp during validation stage, instead of staging stage.

diff --git a/src/detect-engine-mpm.c b/src/detect-engine-mpm.c
index 303031544438fa8984fb17019b3bb8ed4a1b11b0..983352fbf0945ca94a6c034554b1caf17f0dec73 100644 (file)
--- a/src/detect-engine-mpm.c
+++ b/src/detect-engine-mpm.c
@@ -1997,7 +1997,7 @@ static int PatternMatchPreparePopulateMpm(DetectEngineCtx *de_ctx,
         Signature *s = sgh->match_array[sig];
         if (s == NULL)
             continue;
-        PopulateMpmAddPatternToMpm(de_ctx, sgh, s, RetrieveFPForSigV2(s));
+        PopulateMpmAddPatternToMpm(de_ctx, sgh, s, s->mpm_sm);
     } /* for (sig = 0; sig < sgh->sig_cnt; sig++) */
 
     return 0;

diff --git a/src/detect-parse.c b/src/detect-parse.c
index 8a11857e38a4d264c68c969c011077a99a9aee9b..24e8615f30a6c5a71ffd4bce46ef26a41e3854d2 100644 (file)
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -1258,6 +1258,8 @@ static int SigValidate(Signature *s) {
     }
 #endif
 
+    s->mpm_sm = RetrieveFPForSigV2(s);
+
     SCReturnInt(1);
 }