Fix bad filter logic

Author: atuchin-m

src/filters/fb_builder.rs

@@ -281,11 +281,16 @@ impl NetworkRulesBuilder {
         let mut self_ = Self { lists };
 
         let mut badfilter_ids: HashSet<Hash> = HashSet::new();
-        for filter in network_filters.into_iter() {
-            if filter.is_badfilter() {
-                badfilter_ids.insert(filter.get_id_without_badfilter());
-            }
 
+        // Collect badfilter ids in advance.
+        for filter in network_filters.iter() {
+          if filter.is_badfilter() {
+              badfilter_ids.insert(filter.get_id_without_badfilter());
+          }
+        }
+
+        for filter in network_filters.into_iter() {
+            // skip any bad filters
             let filter_id = filter.get_id();
             if badfilter_ids.contains(&filter_id) || filter.is_badfilter() {
                 continue;

tests/unit/engine.rs

@@ -219,9 +219,9 @@ mod tests {
         let data = engine.serialize().unwrap();
 
         let expected_hash = if cfg!(feature = "css-validation") {
-            2449299753308785566
+            12046041060659687422
         } else {
-            13012908745357887728
+            11420623023091203502
         };
 
         assert_eq!(hash(&data), expected_hash, "{}", HASH_MISMATCH_MSG);