From 744167056cea37fd6b225416624ff84bbb130b8f Mon Sep 17 00:00:00 2001 From: Dimitrios Christidis Date: Thu, 16 Jul 2015 18:49:26 +0300 Subject: [PATCH] matroskademux: fix for subtitle buffers with NUL terminators Commit 45892ec8 created a regression where g_utf8_validate() would fail if the subtitle buffer had a NUL terminator as part of the data. https://bugzilla.gnome.org/show_bug.cgi?id=752421 --- gst/matroska/matroska-demux.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 606b5931da..6173240d64 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -2986,21 +2986,11 @@ gst_matroska_demux_check_subtitle_buffer (GstElement * element, if (!gst_buffer_get_size (*buf) || !gst_buffer_map (*buf, &map, GST_MAP_READ)) return GST_FLOW_OK; - /* Need \0-terminator at the end */ - if (map.data[map.size - 1] != '\0') { - newbuf = gst_buffer_new_and_alloc (map.size + 1); - - /* Copy old buffer and add a 0 at the end */ - gst_buffer_fill (newbuf, 0, map.data, map.size); - gst_buffer_memset (newbuf, map.size, 0, 1); - gst_buffer_set_size (newbuf, map.size); + /* The subtitle buffer we push out should not include a NUL terminator as + * part of the data. */ + if (map.data[map.size - 1] == '\0') { + gst_buffer_set_size (*buf, map.size - 1); gst_buffer_unmap (*buf, &map); - - gst_buffer_copy_into (newbuf, *buf, - GST_BUFFER_COPY_TIMESTAMPS | GST_BUFFER_COPY_FLAGS | - GST_BUFFER_COPY_META, 0, -1); - gst_buffer_unref (*buf); - *buf = newbuf; gst_buffer_map (*buf, &map, GST_MAP_READ); }