-
-
Notifications
You must be signed in to change notification settings - Fork 31.9k
bpo-30245: possible overflow when organize struct.pack_into error message #1682
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b46b18d
fix 30245
johanliu f228dd7
fix issue 30245
johanliu 890b93e
fix issue 30245
johanliu c876f9a
fix 30245
johanliu d7cc609
add name to ACKS
johanliu 2c3a43e
fix issue30245
johanliu 3e1d50f
fix
johanliu c4a9927
fix
johanliu 9ed5051
add space in Misc/NEWS
johanliu adac2da
Merge branch 'master' into issue30245
johanliu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1929,11 +1929,15 @@ s_pack_into(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames | |
|
||
/* Check boundaries */ | ||
if ((buffer.len - offset) < soself->s_size) { | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please remove these empty lines. They look distracting. |
||
assert(offset >= 0); | ||
assert(soself->s_size >= 0); | ||
|
||
PyErr_Format(StructError, | ||
"pack_into requires a buffer of at least %zd bytes for " | ||
"pack_into requires a buffer of at least %zu bytes for " | ||
"packing %zd bytes at offset %zd " | ||
"(actual buffer size is %zd)", | ||
soself->s_size + offset, | ||
(size_t)soself->s_size + (size_t)offset, | ||
soself->s_size, | ||
offset, | ||
buffer.len); | ||
|
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.
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.
Use raw string literals. Compiling
"\("
emits a deprecation warning.You also could use classic string formatting, string's format() method, or f-string expression for composing this string.