summaryrefslogtreecommitdiffstats
path: root/sys/ximage
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2007-03-01 10:44:36 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2007-03-01 10:44:36 +0000
commit3c31633120875b170cf9bad4d092565a18f0708d (patch)
treec58424d5411b2e5605c04cdcdd4e47f600791cdb /sys/ximage
parentdc212cdb3de27c3a42310342fcd5ee9fa78556a1 (diff)
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.
Diffstat (limited to 'sys/ximage')
-rw-r--r--sys/ximage/gstximagesrc.c7
1 files changed, 7 insertions, 0 deletions
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;