archive/zzip: fix crash on corrupt ZIP file

Sometimes, zzip_file_read() returns 0 even though the end of the file was not reached. This causes assertion failures in DecoderBridge::Read(). Closes https://github.com/MusicPlayerDaemon/MPD/issues/935

archive/zzip: fix crash on corrupt ZIP file
1f6a7d64 · Max Kellermann · e44b953d · 1f6a7d64 · 1f6a7d64
Commit 1f6a7d64 authored Sep 04, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

NEWS NEWS +2 -0

ZzipArchivePlugin.cxx src/archive/plugins/ZzipArchivePlugin.cxx +7 -0

No files found.
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ ver 0.21.26 (not yet released)
 * output
  - osx: fix crash bug
  - sles: support floating point samples
+* archive
+  - zzip: fix crash on corrupt ZIP file
 * decoder
  - sndfile: fix lost samples at end of file


--- a/src/archive/plugins/ZzipArchivePlugin.cxx
+++ b/src/archive/plugins/ZzipArchivePlugin.cxx
@@ -32,6 +32,8 @@

 #include <zzip/zzip.h>

+#include <inttypes.h> /* for PRIoffset (PRIu64) */
+
 struct ZzipDir {
 	ZZIP_DIR *const dir;

@@ -151,6 +153,11 @@ ZzipInputStream::Read(void *ptr, size_t read_size)
 	if (nbytes < 0)
 		throw std::runtime_error("zzip_file_read() has failed");

+	if (nbytes == 0 && !IsEOF())
+		throw FormatRuntimeError("Unexpected end of file %s"
+					 " at %" PRIoffset " of %" PRIoffset,
+					 GetURI(), GetOffset(), GetSize());
+
 	offset = zzip_tell(file);
 	return nbytes;
 }