Add synchronized block to protect against race condition

Fixes: facebook#60
alsutton · Jan 20, 2021 · f7e10d5 · f7e10d5
1 parent 545548d
commit f7e10d5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/java/com/facebook/soloader/SoLoader.java b/java/com/facebook/soloader/SoLoader.java
@@ -205,8 +205,10 @@ public static void init(Context context, int flags, @Nullable SoFileLoader soFil
       isSystemApp = checkIfSystemApp(context, flags);
       initSoLoader(soFileLoader);
       initSoSources(context, flags, soFileLoader);
-      if (!NativeLoader.isInitialized()) {
-        NativeLoader.init(new NativeLoaderToSoLoaderDelegate());
+      synchronized(NativeLoader.class) {
+        if (!NativeLoader.isInitialized()) {
+          NativeLoader.init(new NativeLoaderToSoLoaderDelegate());
+        }
       }
     } finally {
       StrictMode.setThreadPolicy(oldPolicy);