Merge a41ba90 into c0df01d

Author: paulb777

.travis.yml

@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode11
+osx_image: xcode12.5
 language: objective-c
 cache:
   bundler: true
@@ -99,14 +99,6 @@ jobs:
       script:
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCrashlytics.podspec --platforms=ios
 
-    - stage: test
-      env:
-        - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
-      script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
-
     - stage: test
       env:
         - PROJECT=GoogleUtilitiesComponents METHOD=pod-lib-lint
@@ -153,18 +145,6 @@ jobs:
       script:
         - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
 
-  allow_failures:
-    # Run fuzz tests only on cron jobs.
-    - stage: test
-#      if: type = cron
-      env:
-        - PROJECT=Firestore PLATFORM=iOS METHOD=fuzz
-      before_install:
-        - ./scripts/install_prereqs.sh
-      script:
-        # The travis_wait is necessary because fuzzing runs for 40 minutes.
-        - travis_wait 45 ./scripts/fuzzing_ci.sh
-
 branches:
   only:
     - master

FirebaseAuth/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 8.5.0
+- [fixed] Fixed an analyze issue introduced in Xcode 12.5. (#8411)
+
 # 8.2.0
 - [fixed] Fixed analyze issues introduced in Xcode 12.5. (#8210)
 - [fixed] Fixed a bug in the link with email link, Game Center, and phone auth flows. (#8196)

FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m

@@ -263,7 +263,7 @@ - (nullable NSString *)reCAPTCHATokenForURL:(NSURL *)URL error:(NSError **_Nonnu
   } else {
     errorData = nil;
   }
-  if (error != NULL) {
+  if (error != NULL && errorData != nil) {
     NSError *jsonError;
     NSDictionary *errorDict = [NSJSONSerialization JSONObjectWithData:errorData
                                                               options:0