Skip to content

Guard against racy access to NSError.setUserInfoValueProvider. #4280

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 1 commit into from
Aug 15, 2016

Conversation

jrose-apple
Copy link
Contributor

This API is documented in its headers to only allow being called once for a particular domain, so we have to make sure our check for an existing provider is synchronized with the setting.

rdar://problem/27541751


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.

This API is documented in its headers to only allow being called once
for a particular domain, so we have to make sure our check for an
existing provider is synchronized with the setting.

rdar://problem/27541751
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test OS X platform

@jrose-apple
Copy link
Contributor Author

Thanks to @gparker42 for helping track this down!

@phausler, does this seem like the best fix?

@jrose-apple
Copy link
Contributor Author

also cc @DougGregor for when he gets back from vacation.

@najacque
Copy link
Contributor

@swift-ci Please smoke test OS X platform

@najacque
Copy link
Contributor

@jrose-apple Just checking to make sure smoke tests were triggering and reporting correctly.

@jrose-apple
Copy link
Contributor Author

No response from Philippe; how about @parkera?

@parkera
Copy link
Contributor

parkera commented Aug 15, 2016

LGTM

@jrose-apple jrose-apple merged commit af1a815 into swiftlang:master Aug 15, 2016
@jrose-apple jrose-apple deleted the racy-NSError-userInfo branch August 15, 2016 20:34
@jrose-apple
Copy link
Contributor Author

Thanks, Tony!

@DougGregor
Copy link
Member

Good find, @jrose-apple and @gparker42.

jrose-apple added a commit to jrose-apple/swift that referenced this pull request Aug 30, 2016
…lang#4280)

This API is documented in its headers to only allow being called once
for a particular domain, so we have to make sure our check for an
existing provider is synchronized with the setting.

rdar://problem/27541751
(cherry picked from commit af1a815)
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.

4 participants