From 43579a3b9501bfb578c35e66c565e1974c77efab Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Tue, 5 Dec 2017 00:28:27 +0100 Subject: Events.c: move variable to inner scope --- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Rootless.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index f42f9d99d..364f0cbe4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -251,7 +251,6 @@ Bool nxagentRootlessTreesMatch() Window parent_return; Window *children_return; unsigned int nChildrenReturn; - WindowPtr pW; WindowPtr pTestWin = screenInfo.screens[0]->root -> firstChild; Bool treesMatch = True; Status result; @@ -270,7 +269,7 @@ Bool nxagentRootlessTreesMatch() while (nChildrenReturn > 0) { - pW = nxagentWindowPtr(children_return[--nChildrenReturn]); + WindowPtr pW = nxagentWindowPtr(children_return[--nChildrenReturn]); if (!pW) { -- cgit v1.2.3 From cdaec755d8800d3cb78e3d7c65b4320c067e27cf Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Tue, 5 Dec 2017 00:29:10 +0100 Subject: Make sure XQueryTree results are freed Fixes ArcticaProject/nx-libs#585 --- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Rootless.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index 364f0cbe4..437140f61 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -249,7 +249,7 @@ Bool nxagentRootlessTreesMatch() { Window root_return; Window parent_return; - Window *children_return; + Window *children_return = NULL; unsigned int nChildrenReturn; WindowPtr pTestWin = screenInfo.screens[0]->root -> firstChild; Bool treesMatch = True; -- cgit v1.2.3