Add ANDROID_SIGABRT_REGEX and ANDROID_SIGTRAP_REGEX to catch

`SIGABRT` and `SIGTRAP` crashes

Author: AYUSHMAAN-B

src/clusterfuzz/stacktraces/__init__.py

@@ -783,20 +783,6 @@ def parse(self, stacktrace: str) -> CrashInfo:
             mte_match = ANDROID_SEGV_REGEX.search(line)
             state.crash_type = f"Tag-mismatch{(mte_match.group(2) or '')}"
 
-          # If the line indicates an MTE Abort (SIGABRT), set the crash_type
-          # to "Abort".
-          if ('SIGABRT' in line and state.crash_type not in
-              IGNORE_CRASH_TYPES_FOR_ABRT_BREAKPOINT_AND_ILLS):
-            state.crash_type = 'Abort'
-
-          # If the line indicates an MTE Trap (SIGTRAP), extract and set the
-          # crash_address using regex and set the crash_type to "Trap".
-          if ('SIGTRAP' in line and state.crash_type not in
-              IGNORE_CRASH_TYPES_FOR_ABRT_BREAKPOINT_AND_ILLS):
-            mte_match = ANDROID_SEGV_REGEX.search(line)
-            state.crash_type = 'Trap'
-            state.crash_address = mte_match.group(1) or ''
-
           # Set the crash address for SEGVs.
           if 'SIGSEGV' in line:
             state.crash_address = android_segv_match.group(1)
@@ -809,7 +795,26 @@ def parse(self, stacktrace: str) -> CrashInfo:
           if process_name_match:
             state.process_name = process_name_match.group(1).capitalize()
 
-      # Android SIGABRT handling.
+      if (state.crash_type not in
+          IGNORE_CRASH_TYPES_FOR_ABRT_BREAKPOINT_AND_ILLS):
+        # Android SIBTRAP handling
+        mte_match = ANDROID_SIGTRAP_REGEX.search(line)
+        self.update_state_on_match(
+            ANDROID_SIGTRAP_REGEX,
+            line,
+            state,
+            new_type='Trap',
+            new_address=(mte_match.group(1) if mte_match else ''))
+
+        # Android SIGABRT handling.
+        self.update_state_on_match(
+            ANDROID_SIGABRT_REGEX,
+            line,
+            state,
+            new_type='Abort',
+            new_address='')
+
+      #Android Abort handling
       android_abort_match = self.update_state_on_match(
           ANDROID_ABORT_REGEX,
           line,

src/clusterfuzz/stacktraces/constants.py

@@ -44,6 +44,9 @@
 # Parentheses are optional.
 ANDROID_PROCESS_NAME_REGEX = re.compile(r'.*[(](.*)[)]$')
 ANDROID_SEGV_REGEX = re.compile(r'.*signal.*\(SIG.*fault addr ([^ ]*)(.*)')
+ANDROID_SIGABRT_REGEX = re.compile(r'.*signal.*\(SIGABRT.*fault addr --------')
+ANDROID_SIGTRAP_REGEX = re.compile(
+    r'.*signal.*\(SIGTRAP.*fault addr ([^ ]*)(.*)')
 ASAN_INVALID_FREE_REGEX = re.compile(
     r'.*AddressSanitizer: '
     r'attempting free on address which was not malloc\(\)-ed: '