projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c959729
)
qtdemux: check return from qt_demux_video_caps
author
Luis de Bethencourt
<luis@debethencourt.com>
Sun, 27 Apr 2014 00:51:36 +0000
(20:51 -0400)
committer
Luis de Bethencourt
<luis@debethencourt.com>
Sun, 27 Apr 2014 00:51:36 +0000
(20:51 -0400)
Now qtdemux_video_caps() can return NULL. We need to check this return before
using it's value.
https://bugzilla.gnome.org/show_bug.cgi?id=728987
gst/isomp4/qtdemux.c
patch
|
blob
|
history
diff --git
a/gst/isomp4/qtdemux.c
b/gst/isomp4/qtdemux.c
index a81ad7e7c0b97b4f188b6ca2d6aa583b6d0e461f..d5c515f8fec52bea6d06c959a1d8a800cf732a1c 100644
(file)
--- a/
gst/isomp4/qtdemux.c
+++ b/
gst/isomp4/qtdemux.c
@@
-7477,6
+7477,9
@@
qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
stream->caps =
qtdemux_video_caps (qtdemux, stream, fourcc, stsd_data, &codec);
+ if (G_UNLIKELY (!stream->caps))
+ goto unknown_stream;
+
if (codec) {
list = gst_tag_list_new_empty ();
gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,