Fix argument order for CFArraySetValueAtIndex. #1679
Merged
Conversation
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
The Swift dispatching of CFArraySetValueAtIndex had the arguments for value and index switched around. If someone creates a Swift NSArray which is eventually bridged to CFArray, and some other piece calls CFArraySetValueAtIndex, CF_SWIFT_FUNCDISPATCHV will delegate to the Swift method, but will send a pointer where CFIndex is expected, and a CFIndex where a pointer is expected, probably causing a segmentation fault. The test tries to simplify the scenario (not easy to create the right conditions) and uses unsafeBitCast (which is the same that happens in the internal _cfObject). The test crashes before the patch is applied.
|
@swift-ci test |
millenomi
reviewed
Aug 31, 2018
| @@ -628,7 +628,7 @@ void CFArrayAppendValue(CFMutableArrayRef array, const void *value) { | |||
| } | |||
|
|
|||
| void CFArraySetValueAtIndex(CFMutableArrayRef array, CFIndex idx, const void *value) { | |||
| CF_SWIFT_FUNCDISPATCHV(CFArrayGetTypeID(), void, (CFSwiftRef)array, NSMutableArray.setObject, idx, value); | |||
| CF_SWIFT_FUNCDISPATCHV(CFArrayGetTypeID(), void, (CFSwiftRef)array, NSMutableArray.setObject, value, idx); | |||
There was a problem hiding this comment.
We should really name all the arguments in order in the bridge struct field name to prevent this from occurring again. Is there any way I can convince you to add an edit so this reads NSMutableArray.setObjectAtIndex?
✅ whether this is done or not.
There was a problem hiding this comment.
I would prefer to do that as a different PR, if you don’t mind. It might be also kind of a big change.
millenomi
approved these changes
Aug 31, 2018
parkera
approved these changes
Sep 14, 2018
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 Swift dispatching of CFArraySetValueAtIndex had the arguments for
value and index switched around. If someone creates a Swift NSArray
which is eventually bridged to CFArray, and some other piece calls
CFArraySetValueAtIndex, CF_SWIFT_FUNCDISPATCHV will delegate to the
Swift method, but will send a pointer where CFIndex is expected, and a
CFIndex where a pointer is expected, probably causing a segmentation
fault.
The test tries to simplify the scenario (not easy to create the right
conditions) and uses unsafeBitCast (which is the same that happens in
the internal _cfObject). The test crashes before the patch is applied.