NSString addingPercentEncoding methods should return nil for invalid UTF-16#1891
Merged
jrflat merged 1 commit intoswiftlang:mainfrom Apr 10, 2026
Merged
Conversation
…for invalid UTF-16
Contributor
Author
|
@swift-ci please test |
jmschonfeld
approved these changes
Apr 10, 2026
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.
The new Swift implementation for
-[NSString addingPercentEncoding...]methods should returnnilforNSStrings with invalid (unpaired) UTF-16 surrogates instead of using theU+FFFDreplacement character.Motivation:
Restore previous behavior of returning
nilwhen anNSStringcontains an unpaired UTF-16 surrogate.Modifications:
The extensions now validate UTF-16 backed
NSStrings viaString(validating: ..., as: UTF16.self)instead of just bridging toString(which replaces invalid UTF-16 withU+FFFDwhen accessing the bytes via.withUTF8 { ... }).Result:
No behavior change for swift-foundation. On Darwin, these
NSStringmethods maintain their old behavior when the Swift implementation is enabled.Testing:
NSStringtesting of these methods for strings containing unpaired UTF-16 surrogates.