commit 05ddbf0875b449f69616c31fbbe49dd5f3d5e329
author Serhiy Storchaka <storchaka@gmail.com> Wed Apr 01 16:56:13 2015 +0300
committer Serhiy Storchaka <storchaka@gmail.com> Wed Apr 01 16:56:13 2015 +0300
tree e7cbf07a3fad26c69006f38e2216d5c56d1c786b
parent ef2a397a65bf5f321a04aa429efa76f910849e31
parent c512adc90d49b1dae3ae14c81826e03c9ea46ba5

Issue #23838: linecache now clears the cache and returns an empty result on
MemoryError.

Lib/linecache.py

diff --git a/Lib/linecache.py b/Lib/linecache.py
index 6e65c37..3afcce1 100644
--- a/Lib/linecache.py
+++ b/Lib/linecache.py
@@ -40,11 +40,14 @@
 
     if filename in cache:
         entry = cache[filename]
-        if len(entry) == 1:
-            return updatecache(filename, module_globals)
-        return cache[filename][2]
-    else:
+        if len(entry) != 1:
+            return cache[filename][2]
+
+    try:
         return updatecache(filename, module_globals)
+    except MemoryError:
+        clearcache()
+        return []
 
 
 def checkcache(filename=None):