diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2020-09-01 11:24:01 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-09-01 13:42:49 +0000 |
| commit | 2b4bc5b6df1a613e6516b5be3f4d580e121a801c (patch) | |
| tree | a59d2a3560c89bfe4ef72c7a311304f536fdd4b8 | |
| parent | b13326ef1a2774a7d2b0253afdc0cf99f0644d03 (diff) | |
| download | nextcloud-server-2b4bc5b6df1a613e6516b5be3f4d580e121a801c.tar.gz nextcloud-server-2b4bc5b6df1a613e6516b5be3f4d580e121a801c.zip | |
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>
| -rw-r--r-- | lib/private/Streamer.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/Streamer.php b/lib/private/Streamer.php index a05f77f3cbd..0e3018f77b7 100644 --- a/lib/private/Streamer.php +++ b/lib/private/Streamer.php @@ -76,8 +76,12 @@ class Streamer { * would still be possible to create an invalid zip32 file (for example, * a zip file from files smaller than 4GB with a central directory * 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]); } elseif ($request->isUserAgent($this->preferTarFor)) { $this->streamerInstance = new TarStreamer(); |