From 35e41467a2ef4c2ddd4b545c2d68abf47278aa1e Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Tue, 13 Dec 2016 02:02:29 +0100 Subject: Window.c: Fix reference before check for null pointer --- nx-X11/programs/Xserver/hw/nxagent/Window.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index 982c88314..23e1d5452 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -3122,10 +3122,14 @@ static void nxagentReconfigureWindowCursor(void * param0, XID param1, void * dat WindowPtr pWin = (WindowPtr)param0; Bool *pBool = (Bool*)data_buffer; CursorPtr pCursor; - ScreenPtr pScreen = pWin -> drawable.pScreen; + ScreenPtr pScreen; - if (!pWin || !*pBool || !(pCursor = wCursor(pWin)) || - !(nxagentCursorPriv(pCursor, pScreen))) + if (!pWin || !*pBool || !(pCursor = wCursor(pWin))) + return; + + pScreen = pWin -> drawable.pScreen; + + if (!(nxagentCursorPriv(pCursor, pScreen))) { return; } -- cgit v1.2.3