diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-03-01 11:59:55 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-03-01 11:59:55 +0100 |
commit | d156ce5ab6afa3bc67189f4985e1517d5aca52b3 (patch) | |
tree | 76679bd38f93ec2b069e20db90d4e602d368d0ec /nx-X11/programs/Xserver/xfixes/xfixes.c | |
parent | a70e36c8114c0358258e8c3964b9d897884e265e (diff) | |
parent | e7a50079ed90bd9f9f292d3f40ed3905c034a4cc (diff) | |
download | nx-libs-d156ce5ab6afa3bc67189f4985e1517d5aca52b3.tar.gz nx-libs-d156ce5ab6afa3bc67189f4985e1517d5aca52b3.tar.bz2 nx-libs-d156ce5ab6afa3bc67189f4985e1517d5aca52b3.zip |
Merge branch 'uli42-pr/xfixes_memset' into 3.6.x
Attributes GH PR #788: https://github.com/ArcticaProject/nx-libs/pull/788
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes/xfixes.c')
-rw-r--r-- | nx-X11/programs/Xserver/xfixes/xfixes.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/xfixes.c b/nx-X11/programs/Xserver/xfixes/xfixes.c index fadaf73b2..7fe94a99c 100644 --- a/nx-X11/programs/Xserver/xfixes/xfixes.c +++ b/nx-X11/programs/Xserver/xfixes/xfixes.c @@ -56,14 +56,15 @@ static int ProcXFixesQueryVersion(ClientPtr client) { XFixesClientPtr pXFixesClient = GetXFixesClient (client); - xXFixesQueryVersionReply rep; + xXFixesQueryVersionReply rep = { + .type = X_Reply, + .sequenceNumber = client->sequence, + .length = 0 + }; REQUEST(xXFixesQueryVersionReq); REQUEST_SIZE_MATCH(xXFixesQueryVersionReq); - memset(&rep, 0, sizeof(xXFixesQueryVersionReply)); - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; + if (stuff->majorVersion < SERVER_XFIXES_MAJOR_VERSION) { rep.majorVersion = stuff->majorVersion; rep.minorVersion = stuff->minorVersion; |