handle null nativeLibraryDir in TombstoneParser

Author: supervacuus

sentry-android-core/src/main/java/io/sentry/android/core/internal/tombstone/TombstoneParser.java

@@ -30,8 +30,7 @@ public class TombstoneParser implements Closeable {
   private final InputStream tombstoneStream;
   @NotNull private final List<String> inAppIncludes;
   @NotNull private final List<String> inAppExcludes;
-  // TODO: in theory can be null, but practically not for native crashes
-  private final String nativeLibraryDir;
+  @Nullable private final String nativeLibraryDir;
   private final Map<String, String> excTypeValueMap = new HashMap<>();
 
   private static String formatHex(long value) {
@@ -42,7 +41,7 @@ public TombstoneParser(
       @NonNull final InputStream tombstoneStream,
       @NotNull List<String> inAppIncludes,
       @NotNull List<String> inAppExcludes,
-      String nativeLibraryDir) {
+      @Nullable String nativeLibraryDir) {
     this.tombstoneStream = tombstoneStream;
     this.inAppIncludes = inAppIncludes;
     this.inAppExcludes = inAppExcludes;
@@ -122,7 +121,9 @@ private SentryStackTrace createStackTrace(@NonNull final TombstoneProtos.Thread
       Boolean inApp =
           SentryStackTraceFactory.isInApp(frame.getFunctionName(), inAppIncludes, inAppExcludes);
 
-      inApp = (inApp != null && inApp) || frame.getFileName().startsWith(this.nativeLibraryDir);
+      final boolean isInNativeLibraryDir =
+          nativeLibraryDir != null && frame.getFileName().startsWith(nativeLibraryDir);
+      inApp = (inApp != null && inApp) || isInNativeLibraryDir;
 
       stackFrame.setInApp(inApp);
       frames.add(0, stackFrame);

sentry-android-core/src/test/java/io/sentry/android/core/internal/tombstone/TombstoneParserTest.kt

@@ -410,6 +410,26 @@ class TombstoneParserTest {
     assertEquals(expectedJson, actualJson)
   }
 
+  @Test
+  fun `parses tombstone when nativeLibraryDir is null`() {
+    val tombstoneStream =
+      GZIPInputStream(TombstoneParserTest::class.java.getResourceAsStream("/tombstone.pb.gz"))
+    val parser = TombstoneParser(tombstoneStream, inAppIncludes, inAppExcludes, null)
+    val event = parser.parse()
+
+    // Parsing should succeed without NPE
+    assertNotNull(event)
+    assertEquals(62, event.threads!!.size)
+
+    // Without nativeLibraryDir, frames can only be marked inApp via inAppIncludes
+    // All frames should still have inApp set (either true or false)
+    for (thread in event.threads!!) {
+      for (frame in thread.stacktrace!!.frames!!) {
+        assertNotNull(frame.isInApp)
+      }
+    }
+  }
+
   private fun serializeDebugMeta(debugMeta: DebugMeta): String {
     val logger = mock<ILogger>()
     val writer = StringWriter()