Fix crash in additionalTokenRefreshParameters when emmSupport is nil - #608
Merged
Conversation
w-goog
reviewed
Jul 27, 2026
w-goog
reviewed
Jul 27, 2026
w-goog
requested changes
Jul 27, 2026
w-goog
left a comment
Contributor
There was a problem hiding this comment.
Requested test changes :)
w-goog
requested changes
Jul 29, 2026
w-goog
approved these changes
Jul 29, 2026
Contributor
There was a problem hiding this comment.
This is good to merge :) You can override the swift integration test to do so. Before merging, please file a follow-up issue to make the following changes:
- That the
parametersWithParametersfunction drops key parameters that contain values like a nested array. - We should fix the test swizzling UIDevice to Not Do That (or ensure all the tests are doing it the same way; using the real UIDevice will be non-hermetic).
- Consider upleveling these tests to the public API.
3 tasks
Contributor
Author
|
Merging this PR.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview
This PR fixes an edge case missed by the previous fix for the Swift casting crash in
additionalTokenRefreshParameters(#564).The Problem
The previous fix correctly converted non-string values (like
NSNumber) into theirNSStringrepresentations to avoid a Swift type mismatch exception. However, it missed the scenario whereemmSupportisnilorNO. In that case,[GIDEMMSupport parametersWithParameters:emmSupport:isPasscodeInfoRequired:]returned the original parameters dictionary early, bypassing the newly added string conversion helper.The Fix
This change updates the early return block to apply
[GIDEMMSupport dictionaryWithStringValuesFromDictionary:parameters], ensuring that the dictionary is safely stringified regardless of theemmSupportconfiguration.