diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-06-21 21:46:52 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-07-03 16:13:43 +0200 |
| commit | 1e3db85a026338e5a56de9f75bddeff283ba24fb (patch) | |
| tree | 8546b1ce51c26ff97fd0c1c5b95fe733f691608d /nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | |
| parent | 7a627e644242bdbb00e5cdac4536c64268454af3 (diff) | |
| download | nx-libs-1e3db85a026338e5a56de9f75bddeff283ba24fb.tar.gz nx-libs-1e3db85a026338e5a56de9f75bddeff283ba24fb.tar.bz2 nx-libs-1e3db85a026338e5a56de9f75bddeff283ba24fb.zip | |
Fix some valgrind findings
Some of them have not been seen in the wild yet.
Partly fixes ArcticaProject/nx-libs#711
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c index e59144f94..dba734ad7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c @@ -361,7 +361,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) int nnames; int stringLens; int i; - xListFontsReply reply; + xListFontsReply reply = {0}; char *bufptr; char *bufferStart; int aliascount = 0; @@ -602,13 +602,12 @@ finish: for (i = 0; i < nnames; i++) stringLens += (names->length[i] <= 255) ? names->length[i] : 0; - memset(&reply, 0, sizeof(xListFontsReply)); reply.type = X_Reply; reply.length = (stringLens + nnames + 3) >> 2; reply.nFonts = nnames; reply.sequenceNumber = client->sequence; - bufptr = bufferStart = (char *) malloc(reply.length << 2); + bufptr = bufferStart = (char *) calloc(1, reply.length << 2); if (!bufptr && reply.length) { SendErrorToClient(client, X_ListFonts, 0, 0, BadAlloc); @@ -744,7 +743,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) xFontProp *pFP; int i; int aliascount = 0; - xListFontsWithInfoReply finalReply; + xListFontsWithInfoReply finalReply = {0}; if (client->clientGone) { @@ -967,7 +966,6 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) } finish: length = sizeof(xListFontsWithInfoReply); - bzero((char *) &finalReply, sizeof(xListFontsWithInfoReply)); finalReply.type = X_Reply; finalReply.sequenceNumber = client->sequence; finalReply.length = (sizeof(xListFontsWithInfoReply) |