From: Rémi Duraffort <ivoire@videolan.org>
Date: Tue, 17 Mar 2009 20:34:17 +0000 (+0100)
Subject: fix a segfault when launching a video inside a tty.
X-Git-Tag: 1.0.0-pre1~11
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5dc266b9e98e0c28456d026c0628fb2ebfe72d13;p=vlc

fix a segfault when launching a video inside a tty.
---

diff --git a/modules/control/globalhotkeys/xcb.c b/modules/control/globalhotkeys/xcb.c
index 5aa894e4d5..c5ecacf84c 100644
--- a/modules/control/globalhotkeys/xcb.c
+++ b/modules/control/globalhotkeys/xcb.c
@@ -101,7 +101,11 @@ static int Open( vlc_object_t *p_this )
 
     /* Get the root windows of the default screen */
     memset( &p_sys->root, 0, sizeof( p_sys->root ) );
-    xcb_screen_iterator_t iter = xcb_setup_roots_iterator( xcb_get_setup( p_sys->p_connection ) );
+
+    const xcb_setup_t* xcbsetup = xcb_get_setup( p_sys->p_connection );
+    if( !xcbsetup )
+        goto error;
+    xcb_screen_iterator_t iter = xcb_setup_roots_iterator( xcbsetup );
     for( int i = 0; i < i_screen_default; i++ )
     {
         if( !iter.rem )