fixed boyer-moore init and removed content byte extract var cruft

diff --git a/ChangeLog b/ChangeLog
index 15cbdbcd90444387b82dafb4e45c6657a9b0e41c..95f95f27a9a50f11a84bd6a6611a312c7538e5fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@
 -- added comment for binder bug
 -- fixed non-paf splitter init
 -- fixed splitter update calls
+-- fixed boyer-moore init
+-- removed content extract var cruft
 
 126
 -- pulled latest from tom

diff --git a/src/ips_options/ips_content.cc b/src/ips_options/ips_content.cc
index 5a9464dd668cb483eb530bdbc5aa1f797bc65108..36c4132bd8044d6ec16af6d9968fb91e6cc5ac5b 100644 (file)
--- a/src/ips_options/ips_content.cc
+++ b/src/ips_options/ips_content.cc
@@ -525,10 +525,7 @@ static void parse_content(PatternMatchData* ds_idx, const char* rule)
     memcpy(ds_idx->pattern_buf, tmp_buf, dummy_size);
 
     ds_idx->pattern_size = dummy_size;
-
-    make_precomp(ds_idx);
     ds_idx->negated = negated;
-
     ds_idx->match_delta = GetMaxJumpSize(ds_idx->pattern_buf, ds_idx->pattern_size);
 }
 
@@ -774,8 +771,9 @@ bool ContentModule::end(const char*, int, SnortConfig*)
     if ( pmd->no_case )
     {
         for ( unsigned i = 0; i < pmd->pattern_size; i++ )
-            pmd->pattern_buf[i] = toupper((int)pmd->pattern_buf[i]);
+            pmd->pattern_buf[i] = toupper(pmd->pattern_buf[i]);
     }
+    make_precomp(pmd);
     return true;
 }
 

diff --git a/src/ips_options/ips_content.h b/src/ips_options/ips_content.h
index a96aa33326c39136caa252a9067302f617d1e645..9337b0dd5aa0bde04697b337d1bd685204b3003c 100644 (file)
--- a/src/ips_options/ips_content.h
+++ b/src/ips_options/ips_content.h
@@ -45,8 +45,6 @@ struct PatternMatchData
 
     int8_t offset_var;      /* byte_extract variable indices for offset, */
     int8_t depth_var;       /* depth, distance, within */
-    int8_t distance_var;
-    int8_t within_var;
 
     int no_case;            /* Toggle case sensitivity */
     int relative;           /* do relative pattern searching */