Merge branch 1.0-bugfix into master

[vlc] / modules / video_output / xcb / x11.c

diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 2196fb26438141e040ad596e0a060d7f3d70c2a2..455b31179379b5bb5208b830b14726cb7ae4d31b 100644 (file)
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -115,7 +115,10 @@ static int Open (vlc_object_t *obj)
     /* Connect to X */
     p_sys->conn = Connect (obj);
     if (p_sys->conn == NULL)
+    {
+        free (p_sys);
         return VLC_EGENERIC;
+    }
 
     /* Get window */
     const xcb_screen_t *scr;
@@ -123,6 +126,7 @@ static int Open (vlc_object_t *obj)
     if (p_sys->embed == NULL)
     {
         xcb_disconnect (p_sys->conn);
+        free (p_sys);
         return VLC_EGENERIC;
     }