diff options
| author | Max Kellermann <max@duempel.org> | 2014-11-26 20:01:25 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-11-26 20:02:57 +0100 |
| commit | 27ce80544f60fdb590e72d5a9ef4db4944330b51 (patch) | |
| tree | 44d80510ab07eaa543bd22ec301ac1b17499545b | |
| parent | e72eef421b75516e0447e4a06419d1a7aba4d853 (diff) | |
| parent | 04f627c2af2695c848dd8b9ce25e9603db17fdd8 (diff) | |
| download | mpd-27ce80544f60fdb590e72d5a9ef4db4944330b51.tar.gz mpd-27ce80544f60fdb590e72d5a9ef4db4944330b51.tar.xz mpd-27ce80544f60fdb590e72d5a9ef4db4944330b51.zip | |
Merge tag 'v0.18.19' into v0.19.x
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | src/archive/plugins/ZzipArchivePlugin.cxx | 9 |
2 files changed, 11 insertions, 4 deletions
@@ -1,6 +1,8 @@ ver 0.19.5 (not yet released) * input - nfs: fix crash on connection failure +* archive + - zzip: fix crash after seeking * decoder - dsdiff, dsf, opus: fix deadlock while seeking - mp4v2: remove because of incompatible license @@ -136,6 +138,10 @@ ver 0.19 (2014/10/10) * install systemd unit for socket activation * Android port +ver 0.18.19 (2014/11/26) +* archive + - zzip: fix crash after seeking + ver 0.18.18 (2014/11/18) * decoder - ffmpeg: support opus diff --git a/src/archive/plugins/ZzipArchivePlugin.cxx b/src/archive/plugins/ZzipArchivePlugin.cxx index b4dc7029f..21cb693d8 100644 --- a/src/archive/plugins/ZzipArchivePlugin.cxx +++ b/src/archive/plugins/ZzipArchivePlugin.cxx @@ -168,12 +168,13 @@ bool ZzipInputStream::Seek(offset_type new_offset, Error &error) { zzip_off_t ofs = zzip_seek(file, new_offset, SEEK_SET); - if (ofs != -1) { + if (ofs < 0) { error.Set(zzip_domain, "zzip_seek() has failed"); - offset = ofs; - return true; + return false; } - return false; + + offset = ofs; + return true; } /* exported structures */ |