gh-149578: Fix tarfile.open failing on PAX archives with only global headers#149647
Open
ShadiBahaa wants to merge 1 commit intopython:mainfrom
Open
gh-149578: Fix tarfile.open failing on PAX archives with only global headers#149647ShadiBahaa wants to merge 1 commit intopython:mainfrom
ShadiBahaa wants to merge 1 commit intopython:mainfrom
Conversation
…lobal headers When a PAX format tar archive contains only global headers and no regular members, tarfile.open() raised ReadError because the EOFHeaderError from reaching end-of-archive after the global header was being caught and converted to SubsequentHeaderError in TarInfo._proc_pax(). This prevented the caller from handling end-of-archive normally. Fix by letting EOFHeaderError propagate when processing a global header (XGLTYPE), while still treating it as a SubsequentHeaderError for extended headers (XHDTYPE) where a following file entry is mandatory.
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
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.
Summary
Fix
tarfile.open()raisingReadErrorwhen opening a PAX format tar archive that contains only global headers and no regular file members.Root cause: In
TarInfo._proc_pax(), after processing a global header (XGLTYPE), the code tries to read the next header. If the archive has no file entries after the global header, this read encounters the end-of-archive marker and raisesEOFHeaderError. This exception was being caught by the genericexcept HeaderErrorclause and converted toSubsequentHeaderError, which bothTarFile.next()and the append-mode initialization loop treat as a fatal error.Fix: Catch
EOFHeaderErrorseparately before the genericHeaderErrorhandler. For global headers (XGLTYPE), let theEOFHeaderErrorpropagate so callers handle end-of-archive normally. For extended headers (XHDTYPE), a following file entry is mandatory, so the error is still converted toSubsequentHeaderError.Test plan
test_pax_global_header_empty_archiveinPaxWriteTestthat: