Fixed issue where vectorscan matcher was yielding inconsistent results

wordfence/scanning/matching/matching.py

@@ -47,6 +47,9 @@ def process_chunk(
             ):
         raise NotImplementedError()
 
+    def finalize_content(self) -> None:
+        pass
+
     def _record_match(self, identifier: str, matched: str) -> None:
         self.matches[identifier] = matched
 

wordfence/scanning/matching/vectorscan.py

@@ -48,12 +48,15 @@ def process_chunk(
             return True
         return self.matched
 
+    def finalize_content(self) -> None:
+        self.matcher.scanner.reset()
+
     def __enter__(self):
         self.matcher.scanner.set_callback(self._match_callback)
         return super().__enter__()
 
     def __exit__(self, exc_type, exc_value, traceback) -> None:
-        self.matcher.scanner.reset()
+        pass
 
 
 class VectorscanCompiler(Compiler):

wordfence/scanning/scanner.py

@@ -538,6 +538,7 @@ def _process_file(self, path: str, workspace: Optional[MatchWorkspace]):
                         break
                 finally:
                     self._put_profile_event(match_timer)
+            context.finalize_content()
             self._put_event(
                     ScanEventType.FILE_PROCESSED,
                     {

wordfence/util/vectorscan/bindings.py

@@ -444,6 +444,7 @@ def _close_stream(self) -> None:
                 c_void_p()
             )
         _assert_success(error)
+        self._stream = None
 
     def scan(
                 self,