Skip to content

[5.0] {JSON,Plist}{En,De}coder defer container pops #14085

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

Conversation

itaiferber
Copy link
Contributor

@itaiferber itaiferber commented Jan 23, 2018

What's in this pull request?
Cherry-picks #13879 to swift-5.0-branch. Resolves SR-6078 (rdar://problem/36765844) and SR-6408 (rdar://problem/36336754), which became more common failures after #13178.

Itai Ferber added 2 commits January 23, 2018 10:13
Resolve SR-6078 by restoring the JSON/PlistEncoder stack if an error
is thrown after a container was pushed during encode.
Resolve SR-6408 by restoring the JSON/PlistDecoder stack if an error
is thrown after a container was pushed during encode.
@itaiferber
Copy link
Contributor Author

@swift-ci Please smoke test Linux

@itaiferber
Copy link
Contributor Author

@swift-ci Please test macOS

@itaiferber
Copy link
Contributor Author

@swift-ci Please smoke test Linux

@itaiferber itaiferber merged commit f96e00f into swiftlang:swift-5.0-branch Jan 24, 2018
@itaiferber itaiferber deleted the 5.0-jsonencoder-defer-container-pops branch January 24, 2018 17:25
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.

1 participant