From 7ee8516a0f5ccb3d6adaa094de9180b5a17fc50c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 24 Jan 2010 12:50:27 +0000
Subject: Solved a possible crash in closing down the screen due to use on an
 uninitialised pointer.

---
 xorg-server/Xext/xvmain.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xorg-server/Xext')

diff --git a/xorg-server/Xext/xvmain.c b/xorg-server/Xext/xvmain.c
index 05a68907a..3c2454b01 100644
--- a/xorg-server/Xext/xvmain.c
+++ b/xorg-server/Xext/xvmain.c
@@ -277,7 +277,7 @@ XvScreenInit(ScreenPtr pScreen)
 
   /* ALLOCATE SCREEN PRIVATE RECORD */
   
-  pxvs = xalloc (sizeof (XvScreenRec));
+  pxvs = xcalloc (1,sizeof (XvScreenRec));
   if (!pxvs)
     {
       ErrorF("XvScreenInit: Unable to allocate screen private structure\n");
@@ -312,7 +312,7 @@ XvCloseScreen(
   pScreen->DestroyWindow = pxvs->DestroyWindow;
   pScreen->CloseScreen = pxvs->CloseScreen;
 
-  (* pxvs->ddCloseScreen)(ii, pScreen); 
+  if (pxvs->ddCloseScreen) (* pxvs->ddCloseScreen)(ii, pScreen); 
 
   xfree(pxvs);
 
-- 
cgit v1.2.3