Skip to content

[3.7] bpo-25872: Fix KeyError in linecache when multithreaded (GH-18007) (GH-20092) #20511

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
miss-islington merged 1 commit into from
May 29, 2020
Merged

[3.7] bpo-25872: Fix KeyError in linecache when multithreaded (GH-18007) (GH-20092) #20511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
[3.8] bpo-25872: Fix KeyError in linecache when multithreaded (GH-18007… 
…) (GH-20092)

Backporting to 3.8 and adding a NEWS item (I should have added one to the master branch -- oh well).
(cherry picked from commit b86636b)

Co-authored-by: Andrew Kuchling <amk@amk.ca>
  • Loading branch information
@akuchling @miss-islington
akuchling authored and miss-islington committed May 29, 2020
commit 0fe973a28c688ac863e155a6cc1310168a16353f
6 changes: 3 additions & 3 deletions Lib/linecache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ def checkcache(filename=None):
try:
stat = os.stat(fullname)
except OSError:
del cache[filename]
cache.pop(filename, None)
continue
if size != stat.st_size or mtime != stat.st_mtime:
del cache[filename]
cache.pop(filename, None)


def updatecache(filename, module_globals=None):
Expand All @@ -86,7 +86,7 @@ def updatecache(filename, module_globals=None):

if filename in cache:
if len(cache[filename]) != 1:
del cache[filename]
cache.pop(filename, None)
if not filename or (filename.startswith('<') and filename.endswith('>')):
return []

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2020-05-14-13-25-36.bpo-25872.5D5538.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:mod:`linecache` could crash with a :exc:`KeyError` when accessed from multiple threads.
Fix by Michael Graczyk.