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.

diff --git a/ChangeLog b/ChangeLog
index 23803a5..8141c04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2007-03-01  Wim Taymans  <wim@fluendo.com>
 
        * gst/rtsp/gstrtpdec.c: (gst_rtpdec_change_state):

diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index 95dfae8..ba4d52f 100644 (file)
--- 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;