summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gst/effectv/gstquark.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c05a34a..f4e52803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-14 Tim-Philipp Müller <tim at centricular dot net>
+
+ * gst/effectv/gstquark.c: (gst_quarktv_transform),
+ (gst_quarktv_planetable_clear):
+ Add some NULL pointer checks (possibly related to #385623).
+
2006-12-12 Tim-Philipp Müller <tim at centricular dot net>
* gst/apetag/gsttagdemux.c: (gst_tag_demux_chain_parse_tag),
diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c
index 753b7ea0..497f5085 100644
--- a/gst/effectv/gstquark.c
+++ b/gst/effectv/gstquark.c
@@ -167,6 +167,9 @@ gst_quarktv_transform (GstBaseTransform * trans, GstBuffer * in,
src = (guint32 *) GST_BUFFER_DATA (in);
dest = (guint32 *) GST_BUFFER_DATA (out);
+ if (G_UNLIKELY (filter->planetable == NULL))
+ return GST_FLOW_WRONG_STATE;
+
if (filter->planetable[filter->current_plane])
gst_buffer_unref (filter->planetable[filter->current_plane]);
@@ -197,6 +200,9 @@ gst_quarktv_planetable_clear (GstQuarkTV * filter)
{
gint i;
+ if (filter->planetable == NULL)
+ return;
+
for (i = 0; i < filter->planes; i++) {
if (GST_IS_BUFFER (filter->planetable[i])) {
gst_buffer_unref (filter->planetable[i]);