Skip to content

gh-122071: Fixed traceback leaks global code when file does not exist #122126

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

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

gh-122071: Fixed traceback leaks global code when file does not exist #122126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f1e1189
Fixed traceback leaks global code when exec
lhish Jul 22, 2024
f510454
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 22, 2024
dcc5718
Merge branch 'main' into fix-issue-122071
lhish Jul 22, 2024
b40bc28
adapt for zipimporter
lhish Jul 22, 2024
a9f8458
Fixed missing file's lazycache
lhish Jul 22, 2024
0fab629
Update trace_back test
lhish Jul 22, 2024
f3a3f97
Merge branch 'main' into fix-issue-122071
lhish Jul 22, 2024
9d7594a
Merge branch 'main' into fix-issue-122071
lhish Jul 22, 2024
c28b698
Merge branch 'main' into fix-issue-122071
lhish Jul 22, 2024
17e3545
Merge branch 'main' into fix-issue-122071
lhish Aug 24, 2024
44715f2
Update the method to check the existence of the file
lhish Aug 24, 2024
1940da7
Merge branch 'main' into fix-issue-122071
lhish Aug 27, 2024
78d1a14
change description
lhish Aug 27, 2024
363758a
Apply suggestions from code review
lhish Aug 27, 2024
fa2d76b
Revert "Update trace_back test"
lhish Aug 27, 2024
7f7308a
change the implementation of get_lines
lhish Aug 27, 2024
250f026
make restriction stronger
lhish Aug 28, 2024
b2407ff
Merge branch 'main' into fix-issue-122071
lhish Oct 6, 2024
e3796bb
Apply suggestions from code review
lhish Oct 6, 2024
3005636
change return value from true to false
lhish Oct 8, 2024
787ea13
change tests to make it correct
lhish Oct 8, 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
4 changes: 4 additions & 0 deletions Lib/linecache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ def lazycache(filename, module_globals):
loader = getattr(spec, 'loader', None)
if loader is None:
loader = module_globals.get('__loader__')
mod_file = module_globals.get('__file__')
import importlib._bootstrap_external
if isinstance(loader, importlib._bootstrap_external.SourceFileLoader) and (not mod_file or (not mod_file.endswith(filename) and not mod_file.endswith('.pyc'))):
return False
get_source = getattr(loader, 'get_source', None)

if name and get_source:
Expand Down
10 changes: 5 additions & 5 deletions Lib/test/test_linecache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ def test_lazycache_smoke(self):
lines = linecache.getlines(NONEXISTENT_FILENAME, globals())
linecache.clearcache()
self.assertEqual(
True, linecache.lazycache(NONEXISTENT_FILENAME, globals()))
self.assertEqual(1, len(linecache.cache[NONEXISTENT_FILENAME]))
False, linecache.lazycache(NONEXISTENT_FILENAME, globals()))
self.assertEqual(False, NONEXISTENT_FILENAME in linecache.cache)
# Note here that we're looking up a nonexistent filename with no
# globals: this would error if the lazy value wasn't resolved.
self.assertEqual(lines, linecache.getlines(NONEXISTENT_FILENAME))
Expand All @@ -232,11 +232,11 @@ def test_lazycache_bad_filename(self):

def test_lazycache_already_cached(self):
linecache.clearcache()
lines = linecache.getlines(NONEXISTENT_FILENAME, globals())
lines = linecache.getlines(FILENAME, globals())
self.assertEqual(
False,
linecache.lazycache(NONEXISTENT_FILENAME, globals()))
self.assertEqual(4, len(linecache.cache[NONEXISTENT_FILENAME]))
linecache.lazycache(FILENAME, globals()))
self.assertEqual(4, len(linecache.cache[FILENAME]))

def test_memoryerror(self):
lines = linecache.getlines(FILENAME)
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2024-07-22-13-58-16.gh-issue-122071.c5EQZL.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix global code leaks when reporting tracebacks in the REPL and :func:`exec`.
Loading