From 3c31633120875b170cf9bad4d092565a18f0708d Mon Sep 17 00:00:00 2001
From: Zaheer Abbas Merali <zaheerabbas@merali.org>
Date: Thu, 1 Mar 2007 10:44:36 +0000
Subject: sys/ximage/gstximagesrc.c: Error out correctly when getting xcontext
 fails.

Original commit message from CVS:
2007-03-01  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

* sys/ximage/gstximagesrc.c: (gst_ximage_src_open_display):
Error out correctly when getting xcontext fails.
---
 sys/ximage/gstximagesrc.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'sys/ximage')

diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index 95dfae89..ba4d52f4 100644
--- a/sys/ximage/gstximagesrc.c
+++ b/sys/ximage/gstximagesrc.c
@@ -127,6 +127,13 @@ gst_ximage_src_open_display (GstXImageSrc * s, const gchar * name)
 
   g_mutex_lock (s->x_lock);
   s->xcontext = ximageutil_xcontext_get (GST_ELEMENT (s), name);
+  if (s->xcontext == NULL) {
+    g_mutex_unlock (s->x_lock);
+    GST_ELEMENT_ERROR (s, RESOURCE, OPEN_READ,
+        ("Could not open X display for reading"),
+        ("NULL returned from getting xcontext"));
+    return FALSE;
+  }
   s->width = s->xcontext->width;
   s->height = s->xcontext->height;
 
-- 
cgit