From 24b4d5dfda62bf0b4f034ae93aa2cee0d11f72b0 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 21 Jan 2023 12:25:27 -0500 Subject: [PATCH] fix(auth, android): use a safe copy of auth provider info to avoid crash The auth provider data may apparently be modified while being iterated to send to listeners, resulting in a classic ConcurrentModificationException crash Using a shallow copy of the collection for iteration should be a functional equivalent, but without the unwanted "feature" of crashing Fixes #6798 --- .../firebase/auth/ReactNativeFirebaseAuthModule.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java b/packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java index c79417fba6..a6fa1412fd 100644 --- a/packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java +++ b/packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java @@ -70,6 +70,7 @@ import io.invertase.firebase.common.ReactNativeFirebaseModule; import io.invertase.firebase.common.SharedUtils; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.Iterator; @@ -2055,7 +2056,8 @@ private WritableMap getJSError(Exception exception) { private WritableArray convertProviderData( List providerData, FirebaseUser user) { WritableArray output = Arguments.createArray(); - for (UserInfo userInfo : providerData) { + ArrayList providerDataCopy = new ArrayList(providerData); + for (UserInfo userInfo : providerDataCopy) { // remove 'firebase' provider data - android fb sdk // should not be returning this as the ios/web ones don't if (!FirebaseAuthProvider.PROVIDER_ID.equals(userInfo.getProviderId())) {