aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-11-05 21:25:49 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-27 02:42:18 +0100
commit6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060 (patch)
tree4786ef47d0905699657939e469414ab1438ff2e8 /nx-X11/programs/Xserver/hw
parent23dd2959ba5e87d078436b2389d084b76581d12f (diff)
downloadnx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.tar.gz
nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.tar.bz2
nx-libs-6b0a1738f6fcf08b1c5f79fc3f6908d5b1e7b060.zip
Lift mi to xorg-xserver-7.1/1.1.0 state
I left out glx changes to miinitext.c for now.
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
index bcb88d42d..04f746aaf 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
@@ -504,7 +504,7 @@ int what;
BITS32 gcmask, index, mask;
RegionRec prgnWin;
DDXPointRec oldCorner;
- BoxRec box;
+ BoxRec box = {0};
WindowPtr pBgWin;
GCPtr pGC;
register int i;
@@ -566,8 +566,7 @@ int what;
}
}
- prect = (xRectangle *)malloc(RegionNumRects(prgn) *
- sizeof(xRectangle));
+ prect = (xRectangle *)calloc(RegionNumRects(prgn), sizeof(xRectangle));
if (!prect)
return;