summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Bolshakov <ibolsch@gmail.com>2021-05-17 08:28:21 (GMT)
committerGitHub <noreply@github.com>2021-05-17 08:28:21 (GMT)
commitf32c7950e0077b6d9a8e217c2796fc582f18ca08 (patch)
tree783fb3a3cd88974bf33f813170cd29789774de80
parent83f0f8d62f279f846a92fede2244beaa0149b9d8 (diff)
downloadcpython-f32c7950e0077b6d9a8e217c2796fc582f18ca08.zip
cpython-f32c7950e0077b6d9a8e217c2796fc582f18ca08.tar.gz
cpython-f32c7950e0077b6d9a8e217c2796fc582f18ca08.tar.bz2
bpo-43650: Fix MemoryError on zip.read in shutil._unpack_zipfile for large files (GH-25058)
`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
-rw-r--r--Lib/shutil.py16
-rw-r--r--Misc/NEWS.d/next/Library/2021-03-29-00-23-30.bpo-43650.v01tic.rst2
2 files changed, 8 insertions, 10 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py
index 55cfe35..1982b1c 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -1163,20 +1163,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()
diff --git a/Misc/NEWS.d/next/Library/2021-03-29-00-23-30.bpo-43650.v01tic.rst b/Misc/NEWS.d/next/Library/2021-03-29-00-23-30.bpo-43650.v01tic.rst
new file mode 100644
index 0000000..a2ea4a4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-03-29-00-23-30.bpo-43650.v01tic.rst
@@ -0,0 +1,2 @@
+Fix :exc:`MemoryError` in :func:`shutil.unpack_archive` which fails inside
+:func:`shutil._unpack_zipfile` on large files. Patch by Igor Bolshakov.