PHPC-613, PHPC-615: Improve toJSON() error handling #249
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
Member
jmikola
commented
Mar 2, 2016
jmikola
commented
- https://jira.mongodb.org/browse/PHPC-613
- https://jira.mongodb.org/browse/PHPC-615
jmikola
force-pushed
the
phpc-613
branch
3 times, most recently
from
2819b96 to
aa5ebd5
Compare
| @@ -1575,10 +1575,19 @@ PHP_FUNCTION(toJSON) | |||
| char *str; | |||
| size_t str_len; | |||
| str = bson_as_json(b, &str_len); | |||
|
|
|||
| if (!str) { | |||
| phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not convert BSON document to JSON"); | |||
There was a problem hiding this comment.
"JSON string" instead of just JSON?
This adds additional error tests for toJSON(), which demonstrate the problem when both exceptions might have been thrown. Additionally, this ensures that the bson_reader_t is freed before returning. Previously, the code relied on the free after the second exception was thrown.
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.