diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 11:04:10 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 11:04:10 +0100 |
| commit | 20029dbc8f7d03211ceaf00001418fb75b9df644 (patch) | |
| tree | e8950e052bb5ee4328a052a9cf04efc847c47eff /nx-X11/programs/Xserver/Xext/xf86bigfont.c | |
| parent | 9d41e84ea9baf215c6de11224dc2597cd37359dc (diff) | |
| parent | 3e315cd17a519dbcafff18d4294a6f7bb8070767 (diff) | |
| download | nx-libs-20029dbc8f7d03211ceaf00001418fb75b9df644.tar.gz nx-libs-20029dbc8f7d03211ceaf00001418fb75b9df644.tar.bz2 nx-libs-20029dbc8f7d03211ceaf00001418fb75b9df644.zip | |
Merge branch 'uli42-pr/happyvalgrind' into 3.6.x
Fixes ArcticaProject/nx-libs#325.
Fixes ArcticaProject/nx-libs#326.
Attribute GH PR #360: https://github.com/ArcticaProject/nx-libs/pull/360
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/xf86bigfont.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xf86bigfont.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c index 6ec47c4f4..9530a9d7f 100644 --- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c +++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -354,6 +354,7 @@ ProcXF86BigfontQueryVersion( xXF86BigfontQueryVersionReply reply; REQUEST_SIZE_MATCH(xXF86BigfontQueryVersionReq); + memset(&reply, 0, sizeof(xXF86BigfontQueryVersionReply)); reply.type = X_Reply; reply.length = 0; reply.sequenceNumber = client->sequence; @@ -638,7 +639,7 @@ ProcXF86BigfontQueryFont( + (nCharInfos+1)/2 * 2 * sizeof(CARD16) : 0); xXF86BigfontQueryFontReply* reply = - (xXF86BigfontQueryFontReply *) ALLOCATE_LOCAL(rlength); + (xXF86BigfontQueryFontReply *) calloc(1, rlength); char* p; if (!reply) { if (nCharInfos > 0) { @@ -718,7 +719,7 @@ ProcXF86BigfontQueryFont( } } WriteToClient(client, rlength, reply); - DEALLOCATE_LOCAL(reply); + free(reply); if (nCharInfos > 0) { if (shmid == -1) DEALLOCATE_LOCAL(pIndex2UniqIndex); if (!pDesc) DEALLOCATE_LOCAL(pCI); |