PHPC-531, PHPC-616: Fix segfault and improve error reporting for corrupt BSON #250
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-531
- https://jira.mongodb.org/browse/PHPC-616
These test cases are derived from PHPC-615.
| /* Iteration stopped prematurely due to corruption or a failed visitor. | ||
| * While we free the reader, state->zchild should be left as-is, since | ||
| * the calling code may want to zval_ptr_dtor() it. */ | ||
| phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not convert BSON document to PHP"); |
There was a problem hiding this comment.
I think the message is a bit clunky? PHP what? Perhaps, "to a PHP variable" would be better?
Freeing the current zval in the corrupt BSON visitor causes a segfault if done for the root document, since phongo_bson_to_zval_ex() expects the calling code to initialize and free that zval on success or error. That said, we should free when encountering an error via the document or array visitors (i.e. nested context), which would have just been initialized.
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.