GH-93964: Harden overflow checks before _PyBytes_Resize in compile.c #94044
+37
−17
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
markshannon
reviewed
Jun 28, 2022
Python/compile.c
Outdated
| Py_ssize_t b_len = PyBytes_GET_SIZE(*bytes); | ||
| if (unitsize * logical_length >= b_len - to_add * unitsize) { | ||
| // There's not enough room. Double it. | ||
| if (b_len > PY_SSIZE_T_MAX / 2) { |
There was a problem hiding this comment.
This has the same issue as the backport.
We want to be able to index all code object structures with an int, so you'll need INT_MAX instead of PY_SSIZE_T_MAX and it should be an overflow error, not a memory error.
There was a problem hiding this comment.
To clarify, we want a_bytecode to be able to have INT_MAX code units, not just INT_MAX bytes, right?
There was a problem hiding this comment.
We probably want the smaller amount to avoid risk of overflow. So the length in bytes should be less than INT_MAX.
|
Is the PR still relevant or some other PR superseded this one? For merge conflict resolution: touched functions were moved to cc @iritkatriel |
serhiy-storchaka
added
needs backport to 3.12
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.
#93964
The issue was found in 3.10, so it will need to be manually backported there.