NSCFString: fix lengthOfBytesUsingEncoding recursion and getCString encoding direction#60
Open
DTW-Thalion wants to merge 1 commit into
Open
NSCFString: fix lengthOfBytesUsingEncoding recursion and getCString encoding direction#60DTW-Thalion wants to merge 1 commit into
DTW-Thalion wants to merge 1 commit into
Conversation
…ncoding - lengthOfBytesUsingEncoding: called itself unconditionally, recursing until the stack overflowed. Implement it by converting the string with CFStringGetBytes and returning the number of bytes used. - getCString:maxLength:encoding: converted its NSStringEncoding argument with CFStringConvertEncodingToNSStringEncoding (the CF-to-NS direction) before passing it to CFStringGetCString, which expects a CFStringEncoding. Use CFStringConvertNSStringEncodingToEncoding, as the neighbouring methods do. Add Tests/CFString/bridge_encoding.m.
5e062c0 to
95b6f5a
Compare
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.
Summary
Two bugs in the bridged-
CFString(NSCFString) encoding methods:lengthOfBytesUsingEncoding:called itself unconditionally:This recurses until the stack overflows. Implemented by converting the
string with
CFStringGetBytesand returning the number of bytes used.getCString:maxLength:encoding:converted itsNSStringEncodingargument with
CFStringConvertEncodingToNSStringEncoding(the CF→NSdirection) before passing it to
CFStringGetCString, which expects aCFStringEncoding. UseCFStringConvertNSStringEncodingToEncoding, the samedirection the neighbouring methods (
initWithBytes:,maximumLengthOfBytesUsingEncoding:, …) already use.Test
Tests/CFString/bridge_encoding.mbuilds a bridgedCFStringand checkslengthOfBytesUsingEncoding:(which previously crashed) andgetCString:maxLength:encoding:.Note
dataUsingEncoding:allowLossyConversion:has the same reversed conversion, butit cannot currently be exercised end-to-end because
CFStringCreateExternalRepresentationreturns NULL for these encodings — aseparate issue, so it is left out of this change.