From 8b5f47d3a327fb4fcc1fef6cb5c610a999aae82c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 29 Jan 2015 08:20:14 +0100 Subject: decoder/DsdLib: raise ID3 tag limit to 1 MB A bug report was submitted with a 600 kB ID3 tag that could not be read by MPD. --- src/decoder/plugins/DsdLib.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/decoder/plugins/DsdLib.cxx') diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx index 7321261f6..8ce1a94a3 100644 --- a/src/decoder/plugins/DsdLib.cxx +++ b/src/decoder/plugins/DsdLib.cxx @@ -125,7 +125,7 @@ dsdlib_tag_id3(InputStream &is, const id3_length_t count = size - offset; - if (count < 10 || count > 256*1024) + if (count < 10 || count > 1024 * 1024) return; id3_byte_t *const id3_buf = static_cast(xalloc(count)); -- cgit v1.2.3 From 56662a703c82252d9d5ff7002d74ea28527aaa1d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 29 Jan 2015 08:23:01 +0100 Subject: decoder/DsdLib: free ID3 buffer right after id3_tag_parse() Merge two free() calls. --- src/decoder/plugins/DsdLib.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/decoder/plugins/DsdLib.cxx') diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx index 8ce1a94a3..180981620 100644 --- a/src/decoder/plugins/DsdLib.cxx +++ b/src/decoder/plugins/DsdLib.cxx @@ -136,16 +136,13 @@ dsdlib_tag_id3(InputStream &is, } struct id3_tag *id3_tag = id3_tag_parse(id3_buf, count); - if (id3_tag == nullptr) { - free(id3_buf); + free(id3_buf); + if (id3_tag == nullptr) return; - } scan_id3_tag(id3_tag, handler, handler_ctx); id3_tag_delete(id3_tag); - - free(id3_buf); return; } #endif -- cgit v1.2.3 From 7bf638b0deedf02aea46e72f6f3c848e86f2ce0d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 29 Jan 2015 08:21:51 +0100 Subject: decoder/DsdLib: use new[] to allocate the ID3 buffer Don't abort the process if there's not enough memory. This buffer is not important and can be large. --- src/decoder/plugins/DsdLib.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/decoder/plugins/DsdLib.cxx') diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx index 180981620..d826970f7 100644 --- a/src/decoder/plugins/DsdLib.cxx +++ b/src/decoder/plugins/DsdLib.cxx @@ -128,15 +128,17 @@ dsdlib_tag_id3(InputStream &is, if (count < 10 || count > 1024 * 1024) return; - id3_byte_t *const id3_buf = static_cast(xalloc(count)); + id3_byte_t *const id3_buf = new id3_byte_t[count]; + if (id3_buf == nullptr) + return; if (!decoder_read_full(nullptr, is, id3_buf, count)) { - free(id3_buf); + delete[] id3_buf; return; } struct id3_tag *id3_tag = id3_tag_parse(id3_buf, count); - free(id3_buf); + delete[] id3_buf; if (id3_tag == nullptr) return; -- cgit v1.2.3