From fe7d1d7ae0ffabbd19ace6900e1dd9b83e22e95c Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 20 Nov 2008 14:30:40 +0000 Subject: gst/matroska/matroska-mux.c: Fix NULL pointer dereference of an unset codec_id in the recently added Dirac paths Original commit message from CVS: * gst/matroska/matroska-mux.c: Fix NULL pointer dereference of an unset codec_id in the recently added Dirac paths --- ChangeLog | 6 ++++++ gst/matroska/matroska-mux.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0c013a6a..8a894bd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-20 Jan Schmidt + + * gst/matroska/matroska-mux.c: + Fix NULL pointer dereference of an unset codec_id in the recently + added Dirac paths + 2008-11-20 Jan Schmidt * tests/check/Makefile.am: diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 866157fe..97c4333c 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -2099,7 +2099,8 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad) } /* for dirac we have to queue up everything up to a picture unit */ - if (strcmp (collect_pad->track->codec_id, + if (collect_pad->track->codec_id != NULL && + strcmp (collect_pad->track->codec_id, GST_MATROSKA_CODEC_ID_VIDEO_DIRAC) == 0) { buf = gst_matroska_mux_handle_dirac_packet (mux, collect_pad, buf); if (!buf) -- cgit