Fix overflow in search_tree_size #336
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
oschwald
force-pushed
the
greg/fix-search-tree-size-overflow
branch
2 times, most recently
from
4dc2c22
to
060ebf1
Compare
Also, add guards to follow-up calculations to error if they overflow. Closes #335.
oschwald
force-pushed
the
greg/fix-search-tree-size-overflow
branch
from
060ebf1
to
0602d2e
Compare
horgh
requested changes
Jan 9, 2024
src/maxminddb.c
Outdated
|
|
||
| mmdb->data_section = | ||
| mmdb->file_content + search_tree_size + MMDB_DATA_SECTION_SEPARATOR; | ||
| if (search_tree_size + MMDB_DATA_SECTION_SEPARATOR > | ||
| (uint32_t)mmdb->file_size) { | ||
| if (search_tree_size + MMDB_DATA_SECTION_SEPARATOR > mmdb->file_size) { |
There was a problem hiding this comment.
Would we want to check if this would overflow too?
There was a problem hiding this comment.
I am not sure how plausibly this is an issue, but I did add a check. The first part of the updated check is likely redundant as finding the metadata would have failed if that is not true, but I left it for clarity.
horgh
approved these changes
Jan 9, 2024
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.
Also, add guards to follow-up calculations to error if they overflow.
Closes #335.