summaryrefslogtreecommitdiffstats
path: root/Lib/shutil.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-05-17 17:35:30 (GMT)
committerGitHub <noreply@github.com>2021-05-17 17:35:30 (GMT)
commit7a588621c2854bcef6ce9eeb54349b84ac078c45 (patch)
treec1e1af0067b06c305b63c78b61dc4077dafcd6d2 /Lib/shutil.py
parent60fa8b32dbfe452b81c44d2b8a96325fb19a206d (diff)
downloadcpython-7a588621c2854bcef6ce9eeb54349b84ac078c45.zip
cpython-7a588621c2854bcef6ce9eeb54349b84ac078c45.tar.gz
cpython-7a588621c2854bcef6ce9eeb54349b84ac078c45.tar.bz2
bpo-43650: Fix MemoryError on zip.read in shutil._unpack_zipfile for large files (GH-25058) (GH-26190)
`shutil.unpack_archive()` tries to read the whole file into memory, making no use of any kind of smaller buffer. Process crashes for really large files: I.e. archive: ~1.7G, unpacked: ~10G. Before the crash it can easily take away all available RAM on smaller systems. Had to pull the code form `zipfile.Zipfile.extractall()` to fix this Automerge-Triggered-By: GH:gpshead (cherry picked from commit f32c7950e0077b6d9a8e217c2796fc582f18ca08) Co-authored-by: Igor Bolshakov <ibolsch@gmail.com>
Diffstat (limited to 'Lib/shutil.py')
-rw-r--r--Lib/shutil.py16
1 files changed, 6 insertions, 10 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py
index e29fe4d..33f2ca9 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -1161,20 +1161,16 @@ def _unpack_zipfile(filename, extract_dir):
if name.startswith('/') or '..' in name:
continue
- target = os.path.join(extract_dir, *name.split('/'))
- if not target:
+ targetpath = os.path.join(extract_dir, *name.split('/'))
+ if not targetpath:
continue
- _ensure_directory(target)
+ _ensure_directory(targetpath)
if not name.endswith('/'):
# file
- data = zip.read(info.filename)
- f = open(target, 'wb')
- try:
- f.write(data)
- finally:
- f.close()
- del data
+ with zip.open(name, 'r') as source, \
+ open(targetpath, 'wb') as target:
+ copyfileobj(source, target)
finally:
zip.close()