From 63e876609100089534523a876aea4f417ce77c40 Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Tue, 31 Jul 2012 19:05:52 -0700 Subject: [PATCH 1/3] mpd version 0.17.1 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 0334fd045..dee65443d 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.17.1 (2012/??/??) +ver 0.17.1 (2012/07/31) * protocol: - require appropriate permissions for searchadd{,pl} * tags: From 281cd7c05728dcc7a6d6b4aa9a69a02dcdefca5c Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Tue, 31 Jul 2012 19:05:52 -0700 Subject: [PATCH 2/3] Modify version string to post-release version 0.17.2~git --- NEWS | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index dee65443d..c8a536873 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +ver 0.17.2 (2012/??/??) + + ver 0.17.1 (2012/07/31) * protocol: - require appropriate permissions for searchadd{,pl} diff --git a/configure.ac b/configure.ac index c961d1012..f433fd08b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.17.1, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.17.2~git, musicpd-dev-team@lists.sourceforge.net) VERSION_MAJOR=0 VERSION_MINOR=17 From 12be9e818f01777283d49c8e37f618e4e9731371 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 12 Aug 2012 18:58:50 +0200 Subject: [PATCH 3/3] client_file: remove pure attribute from client_allow_file(). That function is not pure, it writes to error. When marked as pure, the compiler is allowed to assume it does not do anything to error, so it can remain NULL, which would result in an invalid read in print_error(). --- NEWS | 2 ++ src/client_file.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c8a536873..d2393e502 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.17.2 (2012/??/??) +* protocol: + - fix crash in local file check ver 0.17.1 (2012/07/31) diff --git a/src/client_file.h b/src/client_file.h index 3dcbe7500..bc64bd041 100644 --- a/src/client_file.h +++ b/src/client_file.h @@ -35,7 +35,6 @@ struct client; * @param path_fs the absolute path name in filesystem encoding * @return true if access is allowed */ -G_GNUC_PURE bool client_allow_file(const struct client *client, const char *path_fs, GError **error_r);