Fix crash in additionalTokenRefreshParameters when emmSupport is nil - #608
Open
AkshatG6 wants to merge 2 commits into
Open
Fix crash in additionalTokenRefreshParameters when emmSupport is nil#608AkshatG6 wants to merge 2 commits into
additionalTokenRefreshParameters when emmSupport is nil#608AkshatG6 wants to merge 2 commits into
Conversation
w-goog
reviewed
Jul 27, 2026
w-goog
reviewed
Jul 27, 2026
| isPasscodeInfoRequired:parameters[kEMMPasscodeInfoParameterName] != nil]; | ||
| } | ||
|
|
||
| + (NSDictionary<NSString *,NSString *> *)parametersWithParameters:(NSDictionary *)parameters |
Contributor
There was a problem hiding this comment.
Let's also fix the tests - I believe the tests always try emmSupport = true, so we're not testing all combinations of parameters :) Ensure that a few variations of NSDictionary are tested; both emmSupport true/false is tested (also, why is this parameter a string????), and isPasscodeInfoRequired true/false is tested.
w-goog
requested changes
Jul 27, 2026
w-goog
left a comment
w-goog
left a comment
Contributor
There was a problem hiding this comment.
Requested test changes :)
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
2 participants
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.