bpo-35714: Reject null characters in struct format strings #16928
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
struct.error is now raised if there is a null character in a struct format string.
Lib/test/test_struct.py
Outdated
| @@ -652,6 +652,13 @@ def test_format_attr(self): | |||
| s2 = struct.Struct(s.format.encode()) | |||
| self.assertEqual(s2.format, s.format) | |||
|
|
|||
| def test_issue35714(self): | |||
| # Embedded null characters should not be allowed in format strings. | |||
| for s in '\0', '\144\u0064\000xf', 'd\0d', '>ih\0', '=Q\0\0': | |||
There was a problem hiding this comment.
What is the difference between all these cases? Why they are needed?
There was a problem hiding this comment.
The embedded null is located at different positions of the string.
There was a problem hiding this comment.
And why it is handled differently depending on the position?
I would test with '\0', '2\0i' and b'\0'.
serhiy-storchaka
approved these changes
May 25, 2020
|
Thanks @ZackerySpytz for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7, 3.8, 3.9. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
May 25, 2020
…16928) struct.error is now raised if there is a null character in a struct format string. (cherry picked from commit 3f59b55) Co-authored-by: Zackery Spytz <[email protected]>
|
GH-20373 is a backport of this pull request to the 3.9 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
May 25, 2020
…16928) struct.error is now raised if there is a null character in a struct format string. (cherry picked from commit 3f59b55) Co-authored-by: Zackery Spytz <[email protected]>
|
GH-20374 is a backport of this pull request to the 3.8 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
May 25, 2020
…16928) struct.error is now raised if there is a null character in a struct format string. (cherry picked from commit 3f59b55) Co-authored-by: Zackery Spytz <[email protected]>
|
GH-20375 is a backport of this pull request to the 3.7 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
May 25, 2020
…16928) struct.error is now raised if there is a null character in a struct format string. (cherry picked from commit 3f59b55) Co-authored-by: Zackery Spytz <[email protected]>
|
GH-20376 is a backport of this pull request to the 3.6 branch. |
miss-islington
added a commit
that referenced
this pull request
May 26, 2020
struct.error is now raised if there is a null character in a struct format string. (cherry picked from commit 3f59b55) Co-authored-by: Zackery Spytz <[email protected]>
ZackerySpytz
added a commit
to ZackerySpytz/cpython
that referenced
this pull request
May 26, 2020
…honGH-16928) struct.error is now raised if there is a null character in a struct format string. (cherry picked from commit 3f59b55) Co-authored-by: Zackery Spytz <[email protected]>
serhiy-storchaka
pushed a commit
that referenced
this pull request
May 26, 2020
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
May 26, 2020
…honGH-16928) (pythonGH-20419) struct.error is now raised if there is a null character in a struct format string. (cherry picked from commit 3f59b55) (cherry picked from commit 5ff5edf) Co-authored-by: Zackery Spytz <[email protected]>
miss-islington
added a commit
that referenced
this pull request
May 26, 2020
…16928) (GH-20419) struct.error is now raised if there is a null character in a struct format string. (cherry picked from commit 3f59b55) (cherry picked from commit 5ff5edf) Co-authored-by: Zackery Spytz <[email protected]>
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.
struct.error is now raised if there is a null character in a struct
format string.
https://bugs.python.org/issue35714