Merge branch 'v0.19.x'

NEWS

@@ -18,6 +18,12 @@ ver 0.20 (not yet released)
 * reset song priority on playback
 * remove dependency on GLib
 
+ver 0.19.8 (not yet released)
+* input
+  - mms: reduce delay at the beginning of playback
+* decoder
+  - dsdiff, dsf: allow ID3 tags larger than 4 kB
+
 ver 0.19.7 (2014/12/17)
 * input
   - nfs: fix crash while canceling a failing file open operation

android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="10"
+          android:versionCode="12"
-          android:versionName="0.19.6">
+          android:versionName="0.19.8">
 
   <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>
 

src/decoder/plugins/DsdLib.cxx

@@ -29,8 +29,10 @@
 #include "input/InputStream.hxx"
 #include "tag/TagId3.hxx"
 #include "util/Error.hxx"
+#include "util/Alloc.hxx"
 
 #include <string.h>
+#include <stdlib.h>
 
 #ifdef ENABLE_ID3TAG
 #include <id3tag.h>
@@ -123,22 +125,27 @@ dsdlib_tag_id3(InputStream &is,
 
 	const id3_length_t count = size - offset;
 
-	/* Check and limit id3 tag size to prevent a stack overflow */
+	if (count < 10 || count > 256*1024)
-	id3_byte_t dsdid3[4096];
-	if (count == 0 || count > sizeof(dsdid3))
 		return;
 
-	if (!decoder_read_full(nullptr, is, dsdid3, count))
+	id3_byte_t *const id3_buf = static_cast<id3_byte_t*>(xalloc(count));
-		return;
 
-	struct id3_tag *id3_tag = id3_tag_parse(dsdid3, count);
+	if (!decoder_read_full(nullptr, is, id3_buf, count)) {
-	if (id3_tag == nullptr)
+		free(id3_buf);
 		return;
+	}
+
+	struct id3_tag *id3_tag = id3_tag_parse(id3_buf, count);
+	if (id3_tag == nullptr) {
+		free(id3_buf);
+		return;
+	}
 
 	scan_id3_tag(id3_tag, handler, handler_ctx);
 
 	id3_tag_delete(id3_tag);
 
+	free(id3_buf);
 	return;
 }
 #endif

src/input/plugins/MmsInputPlugin.cxx

@@ -92,6 +92,13 @@ input_mms_open(const char *url,
 size_t
 MmsInputStream::ThreadRead(void *ptr, size_t read_size, Error &error)
 {
+	/* unfortunately, mmsx_read() blocks until the whole buffer
+	   has been filled; to avoid big latencies, limit the size of
+	   each chunk we read to a reasonable size */
+	constexpr size_t MAX_CHUNK = 16384;
+	if (read_size > MAX_CHUNK)
+		read_size = MAX_CHUNK;
+
 	int nbytes = mmsx_read(nullptr, mms, (char *)ptr, read_size);
 	if (nbytes <= 0) {
 		if (nbytes < 0)