From 8d9eccfd65ef85dcfb0f16f0e075f5747c303a7d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 22 Sep 2016 20:54:06 +0200
Subject: [PATCH] (xvideo.c) Prevent null pointer dereferences for geom
 variable

---
 gfx/drivers/xvideo.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index 08bf119b6e..323d2326c7 100644
--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@@ -508,10 +508,16 @@ static void *xv_init(const video_info_t *video,
    attributes.event_mask   = StructureNotifyMask | KeyPressMask | 
       KeyReleaseMask | ButtonReleaseMask | ButtonPressMask | DestroyNotify | ClientMessage;
 
-   width      = video->fullscreen ? ( (video->width  == 0) ? 
-         geom->base_width : video->width) : video->width;
-   height     = video->fullscreen ? ((video->height == 0)  ? 
-         geom->base_height : video->height) : video->height;
+   if (video->fullscreen)
+   {
+      width      = (((video->width  == 0) && geom) ? geom->base_width : video->width);
+      height     = (((video->height == 0) && geom) ? geom->base_height : video->height);
+   }
+   else
+   {
+      width      = video->width;
+      height     = video->height;
+   }
    g_x11_win  = XCreateWindow(g_x11_dpy, DefaultRootWindow(g_x11_dpy),
          0, 0, width, height,
          0, xv->depth, InputOutput, visualinfo->visual,
@@ -540,8 +546,11 @@ static void *xv_init(const video_info_t *video,
    if (atom != None)
       XvSetPortAttribute(g_x11_dpy, xv->port, atom, 1);
 
-   xv->width  = geom->max_width;
-   xv->height = geom->max_height;
+   if (geom)
+   {
+      xv->width  = geom->max_width;
+      xv->height = geom->max_height;
+   }
 
    xv->image = XvShmCreateImage(g_x11_dpy, xv->port, xv->fourcc,
          NULL, xv->width, xv->height, &xv->shminfo);