8000 gh-121285: Remove backtracking when parsing tarfile headers by sethmlarson · Pull Request #121286 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-121285: Remove backtracking when parsing tarfile headers #121286

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.

Sign up for GitHub

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 11 commits into from
Aug 31, 2024
Merged

gh-121285: Remove backtracking when parsing tarfile headers #121286

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
abb1b03
Remove backtracking when parsing tarfile headers
sethmlarson Jul 2, 2024
647f4ef
Update Misc/NEWS.d/next/Security/2024-07-02-13-39-20.gh-issue-121285.…
sethmlarson Jul 2, 2024
0b5341b
Remove type hints
sethmlarson Jul 2, 2024
9a6cc59
match up to 20 digits in _proc_gnusparse_00
gpshead Jul 3, 2024
39a419c
Rewrite PAX header parsing to be stricter
sethmlarson Jul 9, 2024
4d04f3b
Optimize parsing of GNU extended sparse headers v0.0
sethmlarson Jul 9, 2024
3477a0a
Merge branch 'main' into remove-backtracking-tarfile-members
sethmlarson Jul 16, 2024
94dd198
Merge branch 'main' into remove-backtracking-tarfile-members
sethmlarson Aug 9, 2024
add30cd
Merge branch 'main' into remove-backtracking-tarfile-members
sethmlarson Aug 21, 2024
6ca6329
Address review feedback
sethmlarson Aug 26, 2024
b5c4511
Fix invalid escape sequence
sethmlarson Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
match up to 20 digits in _proc_gnusparse_00 
this is used as an offset/length value, it doesn't need to be longer.  the \d+ prefix on the lines is not treated as an int so it's length bound is not important.
  • Loading branch information
@gpshead
gpshead authored Jul 3, 2024
commit 9a6cc59f6ddbeac7fc5de8b84e40dc8ccb58230e
2 changes: 1 addition & 1 deletion Lib/tarfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,7 +1528,7 @@ def _proc_gnusparse_00(self, next, pax_headers, buf):
"""
def finditer_without_backtracking(buf, needle):
values = []
regex = re.compile(br"^\d{1,20}%s(\d+)\n" % (needle,))
regex = re.compile(br"^\d+%s(\d{1,20})\n" % (needle,))
while True:
if (
# Statement is both a contains check (!=-1) and a bounds check (>0)
Expand Down
Loading
0