diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-12-18 12:27:32 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-12-18 12:27:32 +0000 |
| commit | 1891c3240bdbe7846caea6474ec6be2e0b2b737e (patch) | |
| tree | adc80384ad35a7d967288d39a04bc8ae7899bb06 | |
| parent | 3f787afe0224625066591dae5b37d7fd0eac01f8 (diff) | |
| download | gst-plugins-bad-1891c3240bdbe7846caea6474ec6be2e0b2b737e.tar.gz gst-plugins-bad-1891c3240bdbe7846caea6474ec6be2e0b2b737e.tar.bz2 gst-plugins-bad-1891c3240bdbe7846caea6474ec6be2e0b2b737e.zip | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 5 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2006-12-18 Tim-Philipp Müller <tim at centricular dot net> + + * 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 <thaytan@mad.scientist.com> * 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) |