frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: Fix possible null ptr deref in winActivateAppNativeGDI() 

Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
This commit is contained in:
Ryan Pavlik 2011-10-28 09:49:00 -05:00 committed by Jon TURNEY
parent b907079596
commit a492c02649
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xwin/winnativegdi.c
View File

@ -315,7 +315,6 @@ static Bool
winActivateAppNativeGDI (ScreenPtr pScreen) winActivateAppNativeGDI (ScreenPtr pScreen)
{ {
winScreenPriv(pScreen); winScreenPriv(pScreen);
winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
/* /*
* Are we active? * Are we active?
@ -323,7 +322,8 @@ winActivateAppNativeGDI (ScreenPtr pScreen)
*/ */
if (pScreenPriv != NULL if (pScreenPriv != NULL
&& pScreenPriv->fActive && pScreenPriv->fActive
&& pScreenInfo->fFullScreen) && pScreenPriv->pScreenInfo
&& pScreenPriv->pScreenInfo->fFullScreen)
{ {
/* /*
* Activating, attempt to bring our window * Activating, attempt to bring our window
@ -338,7 +338,8 @@ winActivateAppNativeGDI (ScreenPtr pScreen)
*/ */
if (pScreenPriv != NULL if (pScreenPriv != NULL
&& !pScreenPriv->fActive && !pScreenPriv->fActive
&& pScreenInfo->fFullScreen) && pScreenPriv->pScreenInfo
&& pScreenPriv->pScreenInfo->fFullScreen)
{ {
/* /*
* Deactivating, stuff our window onto the * Deactivating, stuff our window onto the