This repository was archived by the owner on Dec 23, 2021. It is now read-only.
HHVM-183: toJSON() should throw if bson_as_json() fails #72
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
| @@ -99,6 +99,12 @@ Variant HHVM_FUNCTION(MongoDBBsonToJson, const String &data) | |||
|
|
|||
| str = bson_as_json(b, &str_len); | |||
|
|
|||
| if (!str) { | |||
| throw MongoDriver::Utils::throwUnexpectedValueException("Could not convert BSON document to JSON"); | |||
| bson_reader_destroy(reader); | |||
There was a problem hiding this comment.
That doesn't work. The throw is a C++ exception which immediately returns from the function. The destroy should be first, and the return Variant() can be removed.
|
Updated to move freeing before the |
This passes tests for PHPC-613.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
https://jira.mongodb.org/browse/HHVM-183
This passes tests for PHPC-613 (see mongodb/mongo-php-driver#249).