From 1263a3ae411fe768568092ed755d08794d8f6b93 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 5 Apr 2008 00:53:25 +0100 Subject: Fix a regression in the Matroska demuxer. One '&'... --- ChangeLog | 1 + src/demuxers/ebml.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d08f74627..75c0b254e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ xine-lib (1.1.12) 2008-??-?? * Fixed and improved the PulseAudio driver. * Fixed a regression in 1.1.11.1 which broke Quicktime container handling. + * And another, this time in the Matroska demuxer. xine-lib (1.1.11.1) 2008-03-30 * Security fixes: diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c index 0c633643f..4ce8a549d 100644 --- a/src/demuxers/ebml.c +++ b/src/demuxers/ebml.c @@ -327,7 +327,7 @@ char *ebml_alloc_read_ascii (ebml_parser_t *ebml, ebml_elem_t *elem) if (text) { text[elem->len] = '\0'; - if (ebml_read_ascii (ebml, &elem, text)) + if (ebml_read_ascii (ebml, elem, text)) return text; free (text); } -- cgit v1.2.3