From: Anoop Saldanha <poonaatsoc@gmail.com>
Date: Fri, 20 Apr 2012 05:25:16 +0000 (+0530)
Subject: bug 452 - fix detection bug for sigs that don't have a content but need payload inspe... 
X-Git-Tag: suricata-1.3beta2~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=046819e1b8b01875190fdd21eee0f91e61affeaa;p=thirdparty%2Fsuricata.git

bug 452 - fix detection bug for sigs that don't have a content but need payload inspection
---

diff --git a/src/detect.c b/src/detect.c
index 88bd2544f9..0b11a1e01e 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -1560,11 +1560,11 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
                         //    continue;
                         //}
 
-                        if (det_ctx->smsg_pmq[pmq_idx].pattern_id_bitarray != NULL) {
+                        //if (det_ctx->smsg_pmq[pmq_idx].pattern_id_bitarray != NULL) {
                             /* filter out sigs that want pattern matches, but
                              * have no matches */
-                            if (!(det_ctx->smsg_pmq[pmq_idx].pattern_id_bitarray[(s->mpm_pattern_id_div_8)] & s->mpm_pattern_id_mod_8) &&
-                                (s->flags & SIG_FLAG_MPM_STREAM) && !(s->flags & SIG_FLAG_MPM_STREAM_NEG)) {
+                            if ((s->flags & SIG_FLAG_MPM_STREAM) && !(s->flags & SIG_FLAG_MPM_STREAM_NEG) &&
+                                !(det_ctx->smsg_pmq[pmq_idx].pattern_id_bitarray[(s->mpm_pattern_id_div_8)] & s->mpm_pattern_id_mod_8)) {
                                 SCLogDebug("no match in this smsg");
                                 continue;
                             }
@@ -1585,7 +1585,7 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
 
                                 break;
                             }
-                        }
+                        //}
                     }
 
                 } /* if (smsg != NULL) */