summaryrefslogtreecommitdiff
path: root/xserver/hw/xnest
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2024-11-05 08:13:07 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2024-11-05 08:13:07 +0000
commit3ced31dfa7da11653ae880c2776cbf2e2256a009 (patch)
tree981ca5d9ba5a6d1f1cf8b8685faf120dd8c5c96c /xserver/hw/xnest
parent939fde46a015afeec2b96b5cb6d0cc8aefe54c3d (diff)
Update to xserver 21.1.14. tested by tb@
The xkb security fix was committed earlier. This is the rest of the 21.1.14 update.
Diffstat (limited to 'xserver/hw/xnest')
-rw-r--r--xserver/hw/xnest/Cursor.c2
-rw-r--r--xserver/hw/xnest/Events.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/xserver/hw/xnest/Cursor.c b/xserver/hw/xnest/Cursor.c
index 285e10ebf..652abd21e 100644
--- a/xserver/hw/xnest/Cursor.c
+++ b/xserver/hw/xnest/Cursor.c
@@ -98,7 +98,7 @@ xnestRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
bg_color.green = pCursor->backGreen;
bg_color.blue = pCursor->backBlue;
- xnestSetCursorPriv(pCursor, pScreen, malloc(sizeof(xnestPrivCursor)));
+ xnestSetCursorPriv(pCursor, pScreen, calloc(1, sizeof(xnestPrivCursor)));
xnestCursor(pCursor, pScreen) =
XCreatePixmapCursor(xnestDisplay, source, mask, &fg_color, &bg_color,
pCursor->bits->xhot, pCursor->bits->yhot);
diff --git a/xserver/hw/xnest/Events.c b/xserver/hw/xnest/Events.c
index f727557ba..2fecb2542 100644
--- a/xserver/hw/xnest/Events.c
+++ b/xserver/hw/xnest/Events.c
@@ -94,7 +94,7 @@ xnestCollectExposures(void)
RegionInit(&Rgn, &Box, 1);
- miSendExposures(pWin, &Rgn, Box.x2, Box.y2);
+ miSendExposures(pWin, &Rgn, Box.x1, Box.y1);
}
}
}