-
Notifications
You must be signed in to change notification settings - Fork 188
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
query_deserialize() transaction #1437
Merged
Merged
Conversation
This file contains 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
joe-maley
commented
Nov 14, 2019
2dca4e9
to
0d4d7ba
Compare
tdenniston
reviewed
Nov 18, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor comments, and some CI failures.
7313c21
to
1ec1a4f
Compare
joe-maley
commented
Nov 18, 2019
1ec1a4f
to
b989ecc
Compare
tdenniston
approved these changes
Nov 18, 2019
This change ensures that if query_deserialize() returns a non-OK status, both 'copy_state' and 'query' args are in the same state that they entered the routine in. Changes: 1. The existing query_deserialize() implementation has been moved to do_query_deserialize(). 2. query_deserialize() maintains the same interface. 3. query_deserialize() makes a copy of the 'copy_state'. 4. query_deserialize() serializes 'query' into a backup buffer. 5. query_deserialize() invokes do_query_deserialize(). If it fails, query_deserialize() will reset 'copy_state' to the copy in change #3 and it will deserialize the backup buffer from change #4 into 'query. 6. Reverts the logical changes in #1424 because we now handle all deserialization failures, not just user buffer overflow.
b989ecc
to
f41fd6b
Compare
ihnorton
pushed a commit
that referenced
this pull request
Dec 4, 2019
This change ensures that if query_deserialize() returns a non-OK status, both 'copy_state' and 'query' args are in the same state that they entered the routine in. Changes: 1. The existing query_deserialize() implementation has been moved to do_query_deserialize(). 2. query_deserialize() maintains the same interface. 3. query_deserialize() makes a copy of the 'copy_state'. 4. query_deserialize() serializes 'query' into a backup buffer. 5. query_deserialize() invokes do_query_deserialize(). If it fails, query_deserialize() will reset 'copy_state' to the copy in change #3 and it will deserialize the backup buffer from change #4 into 'query. 6. Reverts the logical changes in #1424 because we now handle all deserialization failures, not just user buffer overflow. (cherry picked from commit f41fd6b #1437)
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.
This change ensures that if query_deserialize() returns
a non-OK status, both 'copy_state' and 'query' args are
in the same state that they entered the routine in.
Changes:
been moved to do_query_deserialize().
'copy_state'.
buffer.
it fails, query_deserialize() will reset 'copy_state' to
the copy in change Added new attribute and coordinate types #3 and it will deserialize the backup
buffer from change Fixed bug with real coordinates when computing the tile order. #4 into 'query.
all deserialization failures, not just user buffer overflow.