From 08248e434cfd7e8a595fcabf4ef1346920f35e74 Mon Sep 17 00:00:00 2001
From: Arpad Borsos <arpad.borsos@sentry.io>
Date: Thu, 6 Apr 2023 11:01:52 +0200
Subject: [PATCH] Propagate relative_caller_addr Errors

A followup to this review comment: https://github.com/getsentry/symbolicator/pull/1124#pullrequestreview-1373197774
---
 .../src/services/symbolication/mod.rs         | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/crates/symbolicator-service/src/services/symbolication/mod.rs b/crates/symbolicator-service/src/services/symbolication/mod.rs
index 13736aab7..5e43ee157 100644
--- a/crates/symbolicator-service/src/services/symbolication/mod.rs
+++ b/crates/symbolicator-service/src/services/symbolication/mod.rs
@@ -265,17 +265,15 @@ fn symbolicate_frame(
                 signal,
                 index,
                 adjustment,
-            );
-            relative_addr.and_then(|addr| {
-                symbolicate_native_frame(
-                    demangle_cache,
-                    symcache,
-                    lookup_result,
-                    addr,
-                    frame,
-                    index,
-                )
-            })
+            )?;
+            symbolicate_native_frame(
+                demangle_cache,
+                symcache,
+                lookup_result,
+                relative_addr,
+                frame,
+                index,
+            )
         }
         Ok(CacheFileEntry::PortablePdbCache(ppdb_cache)) => {
             symbolicate_dotnet_frame(ppdb_cache.get(), frame, index)