gh-107398: Fix tarfile stream mode exception when process the file with extra header data #126304
+18
−8
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
Eclips4
reviewed
Nov 1, 2024
Misc/NEWS.d/next/Library/2024-11-02-02-02-31.gh-issue-107398.uUtA6Q.rst
Outdated
Show resolved
Hide resolved
|
@serhiy-storchaka PTAL when you got time( |
|
@serhiy-storchaka ping ( |
Lib/tarfile.py
Outdated
| @@ -480,25 +480,27 @@ def _init_read_gz(self): | |||
| # taken from gzip.GzipFile with some alterations | |||
| if self.__read(2) != b"\037\213": | |||
| raise ReadError("not a gzip file") | |||
| if self.__read(1) != b"\010": | |||
| (method, flag, _) = struct.unpack("<BBIxx", self.__read(8)) | |||
There was a problem hiding this comment.
What will happen if it read less than 8 bytes?
Why use I and then ignore the result?
| xlen = ord(self.__read(1)) + 256 * ord(self.__read(1)) | ||
| self.read(xlen) | ||
| extra_len, = struct.unpack("<H", self.__read(2)) | ||
| self.__read(extra_len) |
There was a problem hiding this comment.
Perhaps the only relevant change is in this line.
…ile with extra header data
Co-authored-by: Kirill Podoprigora <[email protected]>
…UtA6Q.rst Co-authored-by: Kirill Podoprigora <[email protected]>
3bc23ce to
5ffa30b
Compare
|
Hi @serhiy-storchaka Thanks for the review!
|
|
@serhiy-storchaka PTAL when you get time |
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.
Fix #107398