From 143c735f967f84325c56cb042cb5157e77739aa7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Nov 2014 22:08:28 +0100 Subject: [PATCH 1/3] configure.ac: prepare for 0.18.19 --- NEWS | 2 ++ configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 21b44eec3..8a39a6504 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ver 0.18.19 (not yet released) + ver 0.18.18 (2014/11/18) * decoder - ffmpeg: support opus diff --git a/configure.ac b/configure.ac index ca3d9b24f..2e0061954 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.18.18, mpd-devel@musicpd.org) +AC_INIT(mpd, 0.18.19, mpd-devel@musicpd.org) VERSION_MAJOR=0 VERSION_MINOR=18 -VERSION_REVISION=18 +VERSION_REVISION=19 VERSION_EXTRA=0 AC_CONFIG_SRCDIR([src/Main.cxx]) From a254f5a3a8396865cf05e27e0ab03345ee66783a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Nov 2014 22:08:11 +0100 Subject: [PATCH 2/3] archive/zzip: fix inverted error handler Set the Error when zzip_seek()==-1 and not on success. Fixes a crash after seeking. --- NEWS | 2 ++ src/archive/ZzipArchivePlugin.cxx | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 8a39a6504..4699f6666 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.18.19 (not yet released) +* archive + - zzip: fix crash after seeking ver 0.18.18 (2014/11/18) * decoder diff --git a/src/archive/ZzipArchivePlugin.cxx b/src/archive/ZzipArchivePlugin.cxx index 973fe91dc..d3e4cc837 100644 --- a/src/archive/ZzipArchivePlugin.cxx +++ b/src/archive/ZzipArchivePlugin.cxx @@ -186,12 +186,13 @@ zzip_input_seek(InputStream *is, InputPlugin::offset_type offset, { ZzipInputStream *zis = (ZzipInputStream *)is; zzip_off_t ofs = zzip_seek(zis->file, offset, whence); - if (ofs != -1) { + if (ofs < 0) { error.Set(zzip_domain, "zzip_seek() has failed"); - is->offset = ofs; - return true; + return false; } - return false; + + is->offset = ofs; + return true; } /* exported structures */ From 04f627c2af2695c848dd8b9ce25e9603db17fdd8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 26 Nov 2014 19:58:48 +0100 Subject: [PATCH 3/3] release v0.18.19 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 4699f6666..2782ca89d 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.18.19 (not yet released) +ver 0.18.19 (2014/11/26) * archive - zzip: fix crash after seeking