fix: DebugStackTrace Android AssemblyReader init locking

getsentry · Dec 6, 2022 · e3b4a8f · e3b4a8f
1 parent 48004cb
commit e3b4a8f
Showing 1 changed file with 29 additions and 15 deletions.
diff --git a/src/Sentry/Internal/DebugStackTrace.cs b/src/Sentry/Internal/DebugStackTrace.cs
@@ -372,31 +372,45 @@ private static void DemangleLambdaReturnType(SentryStackFrame frame)
 #if ANDROID
     private IAndroidAssemblyReader? _assemblyReader;
     private bool _assemblyReaderInitialized = false;
+    private object _assemblyReaderLock = new();
 
     private void InitializeAssemblyReader()
     {
         if (_assemblyReaderInitialized)
         {
             return;
         }
-        _assemblyReaderInitialized = true;
-
-        var apkPath = Environment.CommandLine;
-        if (!File.Exists(apkPath))
-        {
-            _options.LogWarning("Cannot create AssemblyReader: cannot read APK path from Environment.CommandLine={0}", apkPath);
-            return;
-        }
-        try
+        lock (_assemblyReaderLock)
         {
+            // check again after acquiring the lock
+            if (_assemblyReaderInitialized)
+            {
+                return;
+            }
+
+            var apkPath = Environment.CommandLine;
+            try
+            {
+                if (!File.Exists(apkPath))
+                {
+                    _options.DiagnosticLogger?.LogWarning("Cannot create AssemblyReader: cannot read APK path from Environment.CommandLine={0}", apkPath);
+                }
+                else
+                {
 #pragma warning disable CS0618 // Type or member is obsolete
-            var supportedAbis = AndroidBuild.SupportedAbis ?? new List<string> { AndroidBuild.CpuAbi ?? "" };
+                    var supportedAbis = AndroidBuild.SupportedAbis ?? new List<string> { AndroidBuild.CpuAbi ?? "" };
 #pragma warning restore CS0618 // Type or member is obsolete
-            _assemblyReader = AndroidAssemblyReaderFactory.Open(apkPath, supportedAbis, _options.DiagnosticLogger);
-        }
-        catch (Exception e)
-        {
-            _options.LogWarning("Cannot create AssemblyReader: {0}", e.Message);
+                    _assemblyReader = AndroidAssemblyReaderFactory.Open(apkPath, supportedAbis, _options.DiagnosticLogger);
+                }
+            }
+            catch (Exception e)
+            {
+                _options.DiagnosticLogger?.LogError("Cannot create AssemblyReader: {0}", e);
+            }
+            finally
+            {
+                _assemblyReaderInitialized = true;
+            }
         }
     }
 #endif