summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-04-05 02:36:17 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-04-05 02:36:17 +0100
commit240889c0d0a7ead9df29c5d154403490fb09e8c7 (patch)
tree8fad8b484ec1950c576c68815f265e7cb310145a
parent094656d55e8cf2b685fadea1aeffee4fb59f4449 (diff)
downloadxine-lib-240889c0d0a7ead9df29c5d154403490fb09e8c7.tar.gz
xine-lib-240889c0d0a7ead9df29c5d154403490fb09e8c7.tar.bz2
Properly NUL-terminate when reading ID3v2.2 tag content.
-rw-r--r--ChangeLog1
-rw-r--r--src/demuxers/id3.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 999df63b8..7c37a8a48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ xine-lib (1.1.17) 2009-??-??
* Add support for sndio (OpenBSD sound API).
* Correct invalid MIME info in the MOD demuxer.
* Fix a resource leak in libdvdnav.
+ * Properly NUL-terminate when reading ID3v2.2 tag content.
xine-lib (1.1.16.3) 2009-04-03
* Security fixes:
diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
index c6f261468..1aebbc817 100644
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -286,6 +286,7 @@ static int id3v22_interp_frame(input_plugin_t *input,
}
if (input->read (input, buf, frame_header->size) == frame_header->size) {
+ buf[frame_header->size] = 0;
enc = buf[0];
if( enc >= ID3_ENCODING_COUNT )
enc = 0;