mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 06:16:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskademux: fix for subtitle buffers with NUL terminators

Browse source 
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
This commit is contained in:
Dimitrios Christidis 2015-07-16 18:49:26 +03:00 committed by Tim-Philipp Müller
parent 45e05706e2
commit 744167056c
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/matroska/matroska-demux.c
View file

@ -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)) if (!gst_buffer_get_size (*buf) || !gst_buffer_map (*buf, &map, GST_MAP_READ))
return GST_FLOW_OK; return GST_FLOW_OK;
/* Need \0-terminator at the end */ /* The subtitle buffer we push out should not include a NUL terminator as
if (map.data[map.size - 1] != '\0') { * part of the data. */
newbuf = gst_buffer_new_and_alloc (map.size + 1); if (map.data[map.size - 1] == '\0') {
gst_buffer_set_size (*buf, 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);
gst_buffer_unmap (*buf, &map); 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); gst_buffer_map (*buf, &map, GST_MAP_READ);
} }