From 23c26c5e01d272338eef8b88243c35c0ebd9cd90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 21 Jul 2015 16:15:07 +0200 Subject: [PATCH 1/6] Check for undefined stream format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit format element is mandatory but the server will crash if it does not exist in the configuration file. This patch handle the case gracefully. It does not raise an error on unsupported value because documentation allows it. Signed-off-by: Petr Písař --- src/util.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util.c b/src/util.c index 9ecd430..20c2acc 100644 --- a/src/util.c +++ b/src/util.c @@ -135,6 +135,11 @@ stream_setup(const char *host, unsigned short port, const char *mount) return (NULL); } + if (NULL == pezConfig->format) { + printf("%s: stream format is missing\n", __progname); + shout_free(shout); + return (NULL); + } if (!strcmp(pezConfig->format, MP3_FORMAT) && shout_set_format(shout, SHOUT_FORMAT_MP3) != SHOUTERR_SUCCESS) { printf("%s: shout_set_format(MP3): %s\n", From 67e18ed17758de1da38752f210abf4b97296c358 Mon Sep 17 00:00:00 2001 From: Moritz Grimm Date: Tue, 4 Aug 2015 00:28:27 +0200 Subject: [PATCH 2/6] Add entry for ticket #2208 --- NEWS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS b/NEWS index 6e66601..e1dc4f0 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +Changes in 0.6.1, released on XXXX-XX-XX: + +* src/util.c + - [FIX] Fix crash on missing element. From Petr Pisar. + (Ticket #2208) + + + Changes in 0.6.0, released on 2015-01-18: * This release contains a SECURITY FIX for a command injection vulnerability From 758badb0ce99b036369546a6a2622b0caeab0fd2 Mon Sep 17 00:00:00 2001 From: Moritz Grimm Date: Wed, 29 Jan 2020 21:13:19 +0100 Subject: [PATCH 3/6] Bump version, update issue tracker URL --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 03fad83..4490767 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,7 @@ dnl ########### dnl ## SETUP ########################################################### dnl ########### -AC_INIT([ezstream], [0.6.0], - [https://trac.xiph.org/newticket?component=ezstream]) +AC_INIT([ezstream], [0.6.1], [https://gitlab.xiph.org/xiph/ezstream/issues]) AC_REVISION([$Id$]) AC_PREREQ([2.61]) AC_CONFIG_SRCDIR([src/ezstream.c]) From 74140528a1d37b56323a7dda3c29361f003ecc71 Mon Sep 17 00:00:00 2001 From: Moritz Grimm Date: Wed, 29 Jan 2020 21:13:35 +0100 Subject: [PATCH 4/6] Use newer auto-tools --- autogen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 16c4f59..786d0ff 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,8 +2,8 @@ PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/pkg/bin:/usr/pkg/sbin" -_ac_version="2.61" -_am_version="1.10" +_ac_version="2.69" +_am_version="1.15" if [ ! -f "./`basename $0`" ]; then echo "Please chdir into `basename $0`'s directory first." From 4a9ebaae325da8a303672b79b8436ab3e8ef2928 Mon Sep 17 00:00:00 2001 From: Moritz Grimm Date: Wed, 29 Jan 2020 21:18:02 +0100 Subject: [PATCH 5/6] Push out Petr's fix today as well -- but use 1.0.0 instead! --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index e1dc4f0..7e2d155 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Changes in 0.6.1, released on XXXX-XX-XX: +Changes in 0.6.1, released on 2020-01-29: * src/util.c - [FIX] Fix crash on missing element. From Petr Pisar. From fc2dc3ad1a1227669d2bca317016905c8c39d121 Mon Sep 17 00:00:00 2001 From: Moritz Grimm Date: Wed, 29 Jan 2020 21:21:21 +0100 Subject: [PATCH 6/6] Version bump here, too --- win32/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32/config.h b/win32/config.h index 781abc0..18e2970 100644 --- a/win32/config.h +++ b/win32/config.h @@ -1,7 +1,7 @@ #ifndef __WIN32_CONFIG_H__ #define __WIN32_CONFIG_H__ -#define PACKAGE_STRING "ezstream 0.6.0" +#define PACKAGE_STRING "ezstream 0.6.1" #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1