Merge branch 1.0-bugfix into master

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

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 11ea8b586957ce0cc2ed3a4999995e96db8c1895..38d8862d66c6c8d858af941ad737b5fef4d3d98c 100644 (file)
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -159,12 +159,16 @@ 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;
+    }
 
     if (!CheckXVideo (vout, p_sys->conn))
     {
         msg_Warn (vout, "Please enable XVideo 2.2 for faster video display");
         xcb_disconnect (p_sys->conn);
+        free (p_sys);
         return VLC_EGENERIC;
     }
 
@@ -173,6 +177,7 @@ static int Open (vlc_object_t *obj)
     if (p_sys->embed == NULL)
     {
         xcb_disconnect (p_sys->conn);
+        free (p_sys);
         return VLC_EGENERIC;
     }