diff options
| author | Andrew Kuchling <amk@amk.ca> | 2020-05-29 07:59:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 04:59:44 -0700 |
| commit | b86636bff4b29ce23c886df079715dd951f13a07 (patch) | |
| tree | e426c0cda47ec2a9cd568ce367950fae5cf163b8 | |
| parent | 6381ee077d3c69d2f947f7bf87d8ec76e0caf189 (diff) | |
| download | cpython-git-b86636bff4b29ce23c886df079715dd951f13a07.tar.gz | |
[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).
| -rw-r--r-- | Lib/linecache.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-05-14-13-25-36.bpo-25872.5D5538.rst | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Lib/linecache.py b/Lib/linecache.py index 3afcce1f0a..c87e1807bf 100644 --- a/Lib/linecache.py +++ b/Lib/linecache.py @@ -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): @@ -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 [] diff --git a/Misc/NEWS.d/next/Library/2020-05-14-13-25-36.bpo-25872.5D5538.rst b/Misc/NEWS.d/next/Library/2020-05-14-13-25-36.bpo-25872.5D5538.rst new file mode 100644 index 0000000000..3fd8bac73e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-05-14-13-25-36.bpo-25872.5D5538.rst @@ -0,0 +1,2 @@ +:mod:`linecache` could crash with a :exc:`KeyError` when accessed from multiple threads. +Fix by Michael Graczyk. |