diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 21:46:33 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 21:46:33 +0100 |
commit | 96e2556031c8aff62a4650b9cfb814991f5240e1 (patch) | |
tree | 78bbb0c52085036b2a3ff82b29f242173bf39eda /nx-X11/programs/Xserver/hw/nxagent/NXextension.c | |
parent | 89ccf26d65a3f205e54d9f6240b672f970e7b9c1 (diff) | |
parent | 09ef99919c010801bd4220d482a867035b6f4f25 (diff) | |
download | nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.tar.gz nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.tar.bz2 nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.zip |
Merge branch 'uli42-pr/remove_allocate_local' into 3.6.x
Attribute GH PR #369: https://github.com/ArcticaProject/nx-libs/pull/369
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXextension.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXextension.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c index f6c63e699..9ec6be8ef 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c @@ -163,7 +163,7 @@ ProcListExtensions(ClientPtr client) total_length += strlen(extensions[i]->aliases[j]) + 1; } reply.length = (total_length + 3) >> 2; - buffer = bufptr = (char *)ALLOCATE_LOCAL(total_length); + buffer = bufptr = (char *)malloc(total_length); if (!buffer) return(BadAlloc); for (i=0; i<NumExtensions; i++) @@ -189,7 +189,7 @@ ProcListExtensions(ClientPtr client) if (reply.length) { WriteToClient(client, total_length, buffer); - DEALLOCATE_LOCAL(buffer); + free(buffer); } return(client->noClientException); } |