From: Russ Combs <rucombs@cisco.com>
Date: Tue, 1 Jul 2014 16:38:21 +0000 (-0400)
Subject: some fpcreate fixes
X-Git-Tag: 3.0.0-233~1175^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fc39a73e9117d4fa278e4575c570eac60dca930;p=thirdparty%2Fsnort3.git

some fpcreate fixes
---

diff --git a/src/detection/fpcreate.cc b/src/detection/fpcreate.cc
index dee986f7d..fdda9fece 100644
--- a/src/detection/fpcreate.cc
+++ b/src/detection/fpcreate.cc
@@ -906,6 +906,9 @@ struct FpFoo
         if ( size && !rhs.size )
             return true;
 
+        if ( !rhs.pmd )
+            return true;
+
         if ( !pmd->negated && rhs.pmd->negated )
             return true;
 
@@ -927,6 +930,8 @@ static PmType get_pm_type(CursorActionType cat)
     switch ( cat )
     {
     case CAT_SET_RAW:
+    case CAT_SET_FILE:
+    case CAT_SET_OTHER:
         return PM_TYPE__CONTENT;
     case CAT_SET_BODY:
         return PM_TYPE__HTTP_CLIENT_BODY_CONTENT;
@@ -937,6 +942,7 @@ static PmType get_pm_type(CursorActionType cat)
     default:
         break;
     }
+    assert(false);
     return PM_TYPE__MAX;
 }