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

qtdemux: fix potential crash on short MOOV atom

Browse source 
Don't unmap short MOOV atom buffer twice, which happened
in the case where we don't fix up the MOOV atom.

Fixes crashes when thumbnailing partial mp4 file where
the MOOV atom is still incomplete.

https://bugzilla.gnome.org/show_bug.cgi?id=694010
This commit is contained in:
Tim-Philipp Müller 2013-02-18 16:32:13 +00:00
parent 048d256041
commit 34b81f7c93
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/isomp4/qtdemux.c
View file

@ -2751,6 +2751,7 @@ gst_qtdemux_loop_state_header (GstQTDemux * qtdemux)
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
goto beach; goto beach;
gst_buffer_map (moov, &map, GST_MAP_READ); gst_buffer_map (moov, &map, GST_MAP_READ);
if (length != map.size) { if (length != map.size) {
/* Some files have a 'moov' atom at the end of the file which contains /* Some files have a 'moov' atom at the end of the file which contains
* a terminal 'free' atom where the body of the atom is missing. * a terminal 'free' atom where the body of the atom is missing.
@ -2760,13 +2761,14 @@ gst_qtdemux_loop_state_header (GstQTDemux * qtdemux)
guint8 *final_data = map.data + (map.size - 8); guint8 *final_data = map.data + (map.size - 8);
guint32 final_length = QT_UINT32 (final_data); guint32 final_length = QT_UINT32 (final_data);
guint32 final_fourcc = QT_FOURCC (final_data + 4); guint32 final_fourcc = QT_FOURCC (final_data + 4);
gst_buffer_unmap (moov, &map);
if (final_fourcc == FOURCC_free if (final_fourcc == FOURCC_free
&& map.size + final_length - 8 == length) { && map.size + final_length - 8 == length) {
/* Ok, we've found that special case. Allocate a new buffer with /* Ok, we've found that special case. Allocate a new buffer with
* that free atom actually present. */ * that free atom actually present. */
GstBuffer *newmoov = gst_buffer_new_and_alloc (length); GstBuffer *newmoov = gst_buffer_new_and_alloc (length);
gst_buffer_copy_into (newmoov, moov, 0, 0, map.size); gst_buffer_copy_into (newmoov, moov, 0, 0, map.size);
gst_buffer_unmap (moov, &map);
gst_buffer_map (newmoov, &map, GST_MAP_WRITE); gst_buffer_map (newmoov, &map, GST_MAP_WRITE);
memset (map.data + length - final_length + 8, 0, final_length - 8); memset (map.data + length - final_length + 8, 0, final_length - 8);
gst_buffer_unref (moov); gst_buffer_unref (moov);