diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-28 00:18:58 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-28 00:18:58 +0100 |
| commit | 061c357727dd6a3a37e547091d76f26c080f0738 (patch) | |
| tree | a270c581d3268b20ef8527cffeb8ad91b26b9cf7 /nx-X11/programs/Xserver/dix/pixmap.c | |
| parent | bc5f9a2363cb865fa1a8a1427d9320514e7d1889 (diff) | |
| parent | 6acbfab33133a92dbd7f128284d26f94bfeb1af2 (diff) | |
| download | nx-libs-061c357727dd6a3a37e547091d76f26c080f0738.tar.gz nx-libs-061c357727dd6a3a37e547091d76f26c080f0738.tar.bz2 nx-libs-061c357727dd6a3a37e547091d76f26c080f0738.zip | |
Merge branch 'uli42-pr/reduce_uninitialised' into 3.6.x
Diffstat (limited to 'nx-X11/programs/Xserver/dix/pixmap.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/pixmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/pixmap.c b/nx-X11/programs/Xserver/dix/pixmap.c index 747120b48..709f413ed 100644 --- a/nx-X11/programs/Xserver/dix/pixmap.c +++ b/nx-X11/programs/Xserver/dix/pixmap.c @@ -126,7 +126,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize) * the pixmap buffer. This may be a RENDER bug. */ - pPixmap = (PixmapPtr)malloc(pScreen->totalPixmapSize + pixDataSize + 4); + pPixmap = (PixmapPtr)calloc(1, pScreen->totalPixmapSize + pixDataSize + 4); if (!pPixmap) return NullPixmap; ppriv = (DevUnion *)(pPixmap + 1); @@ -144,7 +144,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize) ppriv->ptr = (void *)NULL; } #else - pPixmap = (PixmapPtr)malloc(sizeof(PixmapRec) + pixDataSize); + pPixmap = (PixmapPtr)calloc(1, sizeof(PixmapRec) + pixDataSize); #endif return pPixmap; } |