Skip to content

[libdispatch] libdispatch data fixes #3648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 21, 2016
Merged

[libdispatch] libdispatch data fixes #3648

merged 2 commits into from
Jul 21, 2016

Conversation

mwwa
Copy link
Contributor

@mwwa mwwa commented Jul 20, 2016

What's in this pull request?

Two fixes:

  1. DispatchDataIterator crashed when iterating the empty dispatch data object.
  2. Appending UnsafeBufferPointer values to a DispatchData causes libdispatch to be invoked with the wrong destructor pointer, leading to corruption of the data objects.

Resolved bug number:

(SR-2050)


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

A smoke test on macOS does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library only for macOS. Simulator standard libraries and
    device standard libraries are not built.
  3. lldb is not built.
  4. The test and validation-test targets are run only for macOS. The optimized
    version of these tests are not run.

A smoke test on Linux does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library incrementally.
  3. lldb is built incrementally.
  4. The swift test and validation-test targets are run. The optimized version of these
    tests are not run.
  5. lldb is tested.

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
All supported platforms @swift-ci Please test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

Note: Only members of the Apple organization can trigger swift-ci.

mwwa added 2 commits July 20, 2016 14:57
…DispatchData.empty

    *  DispatchDataIterator is unsafe when iterating the empty
    DispatchData object as it forcibly unwraps a nil pointer.
…safe

    * The buffer-pointer based init methods were passing the dispatch
    data default destructor in such a way that the
    @convention(block)-ness was lost. This leads to a thunk being passed
    to dispatch instead of NULL. Subsequently, dispatch would reference
    rather than copy the provided data.

    Fixes:
	SR-2050 (<rdar://problem/27293973>)
@mwwa
Copy link
Contributor Author

mwwa commented Jul 20, 2016

@swift-ci please test

@mwwa mwwa changed the title Libdispatch data fixes [libdispatch] libdispatch data fixes Jul 20, 2016
@mwwa
Copy link
Contributor Author

mwwa commented Jul 20, 2016

@DougGregor Another for review.

@DougGregor DougGregor merged commit 2d7847d into swiftlang:master Jul 21, 2016
@DougGregor
Copy link
Member

LGTM, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants