diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-07 08:35:54 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-07 08:35:54 +0100 |
| commit | eb9618739d0fb99f4aca933750a9d65dbe02aefb (patch) | |
| tree | a7d569f7de444d0acd8f4a09334eec35474f20a3 /nx-X11/programs/Xserver/hw/nxagent/Rootless.c | |
| parent | 5487d52fe1c37244c649c3aefb78600f08ffb91b (diff) | |
| parent | ad53af097ca5ff3c4687ab7c93f776d482760ae8 (diff) | |
| download | nx-libs-eb9618739d0fb99f4aca933750a9d65dbe02aefb.tar.gz nx-libs-eb9618739d0fb99f4aca933750a9d65dbe02aefb.tar.bz2 nx-libs-eb9618739d0fb99f4aca933750a9d65dbe02aefb.zip | |
Merge branch 'uli42-p/xquerytree_leak' into 3.6.x
Attributes GH PR #588: https://github.com/ArcticaProject/nx-libs/pull/588
Fixes: ArcticaProject/nx-libs#585
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Rootless.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index f42f9d99d..437140f61 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -249,9 +249,8 @@ Bool nxagentRootlessTreesMatch() { Window root_return; Window parent_return; - Window *children_return; + Window *children_return = NULL; 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) { |