From 1891c3240bdbe7846caea6474ec6be2e0b2b737e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 18 Dec 2006 12:27:32 +0000 Subject: gst/qtdemux/qtdemux.c: Fix crash dereferencing NULL pointer if there's no stco atom. Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): Fix crash dereferencing NULL pointer if there's no stco atom. Fixes #387122. --- ChangeLog | 6 ++++++ gst/qtdemux/qtdemux.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 91a0797a..59143244 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-18 Tim-Philipp Müller + + * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): + Fix crash dereferencing NULL pointer if there's no stco atom. + Fixes #387122. + 2006-12-18 Jan Schmidt * ext/wavpack/gstwavpackenc.h: diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 7c3864fe..504e1cf8 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -3682,7 +3682,10 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) co64 = qtdemux_tree_get_child_by_type (stbl, FOURCC_co64); if (stco == NULL && co64 == NULL) goto corrupt_file; - stco_data = (const guint8 *) stco->data; + if (stco) + stco_data = (const guint8 *) stco->data; + else + stco_data = NULL; /* sample time */ stts = qtdemux_tree_get_child_by_type (stbl, FOURCC_stts); if (stts == NULL) -- cgit v1.2.1