Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix race condition in SoLoader#init. #99

Closed
wants to merge 1 commit into from
Closed

Fix race condition in SoLoader#init. #99

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion java/com/facebook/soloader/SoLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class SoLoader {
*/
@GuardedBy("sSoSourcesLock")
@Nullable
private static SoSource[] sSoSources = null;
private static volatile SoSource[] sSoSources = null;

@GuardedBy("sSoSourcesLock")
private static final AtomicInteger sSoSourcesVersion = new AtomicInteger(0);
Expand Down Expand Up @@ -278,6 +278,13 @@ private static void initSoSources(Context context, int flags, String[] denyList)
}

sSoSourcesLock.writeLock().lock();

// Double check that sSoSources wasn't initialized while waiting for the lock.
if (sSoSources != null) {
sSoSourcesLock.writeLock().unlock();
return;
}

try {
sFlags = flags;

Expand Down