mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only disable zip64 if the size is known 

Else we might run into the issue that for an external storage where the
size is not known yet we do not use zip64. Which then of course fails on
large zip files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2020-09-01 11:24:01 +02:00 committed by backportbot[bot]
parent b13326ef1a
commit 2b4bc5b6df
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Streamer.php
View File

@ -76,8 +76,12 @@ class Streamer {
* would still be possible to create an invalid zip32 file (for example, * would still be possible to create an invalid zip32 file (for example,
* a zip file from files smaller than 4GB with a central directory * a zip file from files smaller than 4GB with a central directory
* larger than 4GiB), but it should not happen in the real world. * larger than 4GiB), but it should not happen in the real world.
*
* We also have to check for a size above 0. As negative sizes could be
* from not fully scanned external storages. And then things fall apart
* if somebody tries to package to much.
*/ */
if ($size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) { if ($size > 0 && $size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
$this->streamerInstance = new ZipStreamer(['zip64' => false]); $this->streamerInstance = new ZipStreamer(['zip64' => false]);
} elseif ($request->isUserAgent($this->preferTarFor)) { } elseif ($request->isUserAgent($this->preferTarFor)) {
$this->streamerInstance = new TarStreamer(); $this->streamerInstance = new TarStreamer();