diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2023-01-22 09:44:43 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2023-01-22 09:44:43 +0000 |
| commit | cfbafbf69f29d92d0e3435367964d7e256a4deff (patch) | |
| tree | cb7a8af818bbbce338d40630472ded4f2bf95580 /xserver/Xext | |
| parent | 5137be12226ec726cde8f1b16f38c9d0f63c8281 (diff) | |
Merge xserver 21.1.6.
Includes a few fixes to the security patches already committed.
Diffstat (limited to 'xserver/Xext')
| -rw-r--r-- | xserver/Xext/saver.c | 2 | ||||
| -rw-r--r-- | xserver/Xext/xtest.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xserver/Xext/saver.c b/xserver/Xext/saver.c index f73fd01c5..fd6153c31 100644 --- a/xserver/Xext/saver.c +++ b/xserver/Xext/saver.c @@ -1350,8 +1350,8 @@ SProcScreenSaverSuspend(ClientPtr client) { REQUEST(xScreenSaverSuspendReq); - REQUEST_SIZE_MATCH(xScreenSaverSuspendReq); swaps(&stuff->length); + REQUEST_SIZE_MATCH(xScreenSaverSuspendReq); swapl(&stuff->suspend); return ProcScreenSaverSuspend(client); } diff --git a/xserver/Xext/xtest.c b/xserver/Xext/xtest.c index e5d38aa61..9b55b20b3 100644 --- a/xserver/Xext/xtest.c +++ b/xserver/Xext/xtest.c @@ -502,7 +502,7 @@ XTestSwapFakeInput(ClientPtr client, xReq * req) nev = ((req->length << 2) - sizeof(xReq)) / sizeof(xEvent); for (ev = (xEvent *) &req[1]; --nev >= 0; ev++) { - int evtype = ev->u.u.type & 0x177; + int evtype = ev->u.u.type & 0177; /* Swap event */ proc = EventSwapVector[evtype]; /* no swapping proc; invalid event type? */ |