fix: bitops_family crash fixed #4989
Merged
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
kostasrim
reviewed
Apr 24, 2025
src/server/bitops_family.cc
Outdated
Comment on lines
732
to
737
| if (last_byte_offset >= total_bytes) { | ||
| return {}; | ||
| } | ||
|
|
||
| int32_t byte_index = GetByteIndex(offset); | ||
| if (byte_index >= total_bytes) { |
There was a problem hiding this comment.
Suggested change
| if (last_byte_offset >= total_bytes) { | |
| return {}; | |
| } | |
| int32_t byte_index = GetByteIndex(offset); | |
| if (byte_index >= total_bytes) { | |
| if (last_byte_offset >= total_bytes) { |
There was a problem hiding this comment.
This is sufficient. We check the expression above GetByteIndex(attr_.offset + attr_.encoding_bit_size - 1);
There was a problem hiding this comment.
@kostasrim
This is not enough.
I updated the condition, please take a look.
There was a problem hiding this comment.
@kostasrim
Please, take a look again.
src/server/bitops_family.cc
Outdated
Comment on lines
746
to
749
| int32_t lsb_byte_index = GetByteIndex(lsb); | ||
| if (lsb_byte_index >= total_bytes) { | ||
| return {}; | ||
| } |
There was a problem hiding this comment.
We don't have to check again here. The above check is sufficient -- we can remove this change.
kostasrim
previously approved these changes
Apr 25, 2025
src/server/bitops_family.cc
Outdated
| @@ -728,17 +728,25 @@ ResultType Get::ApplyTo(Overflow ov, const string* bitfield) { | |||
| const size_t offset = attr_.offset; | |||
| auto last_byte_offset = GetByteIndex(attr_.offset + attr_.encoding_bit_size - 1); | |||
|
|
|||
| if (GetByteIndex(offset) >= total_bytes && attr_.encoding_bit_size > 0) { | |||
There was a problem hiding this comment.
Suggested change
| if (GetByteIndex(offset) >= total_bytes && attr_.encoding_bit_size > 0) { | |
| if (GetByteIndex(offset) >= total_bytes) { |
There was a problem hiding this comment.
because attr_.encoding_bit_size > 0 is always true. (See how we parse the arguments for this command)
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.
fixes: #4988