1 files changed, 227 insertions, 0 deletions
diff --git a/tests/analysis/scan/grammar.py b/tests/analysis/scan/grammar.py
index 13a255b..14f67fa 100644
--- a/tests/analysis/scan/grammar.py
+++ b/tests/analysis/scan/grammar.py
@@ -2,6 +2,7 @@
 import json
 
 from common import RostTestClass
+from pychrysalide.analysis.contents import MemoryContent
 
 
 class TestRostGrammar(RostTestClass):
@@ -250,6 +251,232 @@ rule test {
                     self.check_rule_failure(rule)
 
 
+    def testMatchCount(self):
+        """Ensure match count provides expected values."""
+
+        cnt = MemoryContent(b'\x01\x02\x02\x03\x03\x03')
+
+        rule = '''
+rule test {
+
+    bytes:
+        $int_01 = "\x01"
+        $int_02 = "\x02"
+        $int_03 = "\x03"
+
+    condition:
+        #int_01 == count($int_01) and #int_01 == 1
+        and #int_02 == count($int_02) and #int_02 == 2
+        and #int_03 == count($int_03) and #int_03 == 3
+        and #int_0* == count($int_0*) and #int_0* == 6
+
+}
+'''
+
+        self.check_rule_success(rule, cnt)
+
+
+    def testBackingUpHandlers(self):
+        """Ensure handlers for backing up removals do not limit the grammar."""
+
+        cnt = MemoryContent(b'AB12')
+
+        # Uncompleted token in rule definition: '?? ?? '
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { ?? ?? }
+
+   condition:
+      #a == 3
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+        # Uncompleted token in rule definition: '?? '
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { ?? 4? }
+
+   condition:
+      #a == 1
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+        # Uncompleted token in rule definition: '?? ?'
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { ?? ?2 }
+
+   condition:
+      #a == 2
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+        # Uncompleted token in rule definition: '?? '
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { ?? 42 }
+
+   condition:
+      #a == 1
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+
+        # Uncompleted token in rule definition: '?1 ?'
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { ?1 ?? }
+
+   condition:
+      #a == 2
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+        # Uncompleted token in rule definition: '?1 4? '
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { ?1 4? }
+
+   condition:
+      #a == 1
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+        # Uncompleted token in rule definition: '?1 ?2 '
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { ?1 ?2 }
+
+   condition:
+      #a == 2
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+        # Uncompleted token in rule definition: '?1 4'
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { ?1 42 }
+
+   condition:
+      #a == 1
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+
+        # Uncompleted token in rule definition: '41 '
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { 41 ?? }
+
+   condition:
+      #a == 1
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+        # Uncompleted token in rule definition: '41 4'
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { 41 4? }
+
+   condition:
+      #a == 1
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+        # Uncompleted token in rule definition: '41 '
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { 41 ?2 }
+
+   condition:
+      #a == 1
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+        # Uncompleted token in rule definition: '41 42 '
+
+        rule = '''
+rule test {
+
+   bytes:
+      $a = { 41 42 }
+
+   condition:
+      #a == 1
+
+}
+'''
+
+        self.check_rule_success(rule, content=cnt)
+
+
+
 
 # TODO : test     <haystack> matches <regex>