Merge branch 'v0.21.x'

NEWS

@@ -5,9 +5,14 @@ ver 0.22 (not yet released)
 ver 0.21.6 (not yet released)
 * protocol
   - allow loading playlists specified as absolute filesystem paths
+  - fix "list" with filter expression
 * input
   - cdio_paranoia: fix build failure due to missing #include
+* playlist
+  - flac: fix use-after-free bug
 * support abstract sockets on Linux
+* Windows
+  - remove the unused libwinpthread-1.dll dependency
 
 ver 0.21.5 (2019/02/22)
 * protocol

src/command/DatabaseCommands.cxx

@@ -268,7 +268,10 @@ handle_list(Client &client, Request args, Response &r)
 	std::unique_ptr<SongFilter> filter;
 	TagType group = TAG_NUM_OF_ITEM_TYPES;
 
-	if (args.size == 1) {
+	if (args.size == 1 &&
+	    /* parantheses are the syntax for filter expressions: no
+	       compatibility mode */
+	    args.front()[0] != '(') {
 		/* for compatibility with < 0.12.0 */
 		if (tagType != TAG_ALBUM) {
 			r.FormatError(ACK_ERROR_ARG,

src/playlist/plugins/FlacPlaylistPlugin.cxx

@@ -34,7 +34,7 @@
 #include <FLAC/metadata.h>
 
 class FlacPlaylist final : public SongEnumerator {
-	const char *const uri;
+	const std::string uri;
 
 	FLAC__StreamMetadata *const cuesheet;
 	const unsigned sample_rate;

src/thread/meson.build

@@ -1,4 +1,11 @@
-threads_dep = dependency('threads')
+if is_windows
+  # avoid the unused libwinpthread-1.dll dependency on Windows; MPD
+  # doesn't use the pthread API on Windows, but this is what Meson
+  # unhelpfully detects for us
+  threads_dep = []
+else
+  threads_dep = dependency('threads')
+endif
 
 conf.set('HAVE_PTHREAD_SETNAME_NP', compiler.has_function('pthread_setname_np', dependencies: threads_dep))