From a6ec907b228229a30f9119432c8b0325389bf8bc Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 10 Apr 2025 19:23:17 +0200 Subject: [PATCH] miext: use calloc() instead of malloc() Using calloc() instead of malloc() as preventive measure, so there never can be any hidden bugs or leaks due uninitialized memory. The extra cost of using this compiler intrinsic should be practically impossible to measure - in many cases a good compiler can even deduce if certain areas really don't need to be zero'd (because they're written to right after allocation) and create more efficient machine code. The code pathes in question are pretty cold anyways, so it's probably not worth even thinking about potential extra runtime costs. Signed-off-by: Enrico Weigelt, metux IT consult --- miext/damage/damage.c | 3 +-- miext/rootless/rootlessScreen.c | 12 ++---------- miext/rootless/rootlessWindow.c | 4 +--- miext/shadow/shadow.c | 3 +-- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 4d2d778f5..bc296f8af 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -1638,7 +1638,6 @@ miDamageDestroy(DamagePtr pDamage) Bool DamageSetup(ScreenPtr pScreen) { - DamageScrPrivPtr pScrPriv; PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); const DamageScreenFuncsRec miFuncs = { @@ -1661,7 +1660,7 @@ DamageSetup(ScreenPtr pScreen) if (!dixRegisterPrivateKey(&damageWinPrivateKeyRec, PRIVATE_WINDOW, 0)) return FALSE; - pScrPriv = malloc(sizeof(DamageScrPrivRec)); + DamageScrPrivPtr pScrPriv = calloc(1, sizeof(DamageScrPrivRec)); if (!pScrPriv) return FALSE; diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 8cf8a1c6d..72d073ec4 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -90,7 +90,7 @@ RootlessUpdateScreenPixmap(ScreenPtr pScreen) free(s->pixmap_data); s->pixmap_data_size = rowbytes; - s->pixmap_data = malloc(s->pixmap_data_size); + s->pixmap_data = calloc(1, s->pixmap_data_size); if (s->pixmap_data == NULL) return; @@ -600,8 +600,6 @@ RootlessWakeupHandler(void *data, int result) static Bool RootlessAllocatePrivates(ScreenPtr pScreen) { - RootlessScreenRec *s; - if (!dixRegisterPrivateKey (&rootlessGCPrivateKeyRec, PRIVATE_GC, sizeof(RootlessGCRec))) return FALSE; @@ -613,17 +611,11 @@ RootlessAllocatePrivates(ScreenPtr pScreen) (&rootlessWindowOldPixmapPrivateKeyRec, PRIVATE_WINDOW, 0)) return FALSE; - s = malloc(sizeof(RootlessScreenRec)); + RootlessScreenRec *s = calloc(1, sizeof(RootlessScreenRec)); if (!s) return FALSE; SETSCREENREC(pScreen, s); - s->pixmap_data = NULL; - s->pixmap_data_size = 0; - - s->redisplay_timer = NULL; - s->redisplay_timer_set = FALSE; - return TRUE; } diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index 891807320..fea3472c9 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -363,7 +363,6 @@ static RootlessWindowRec * RootlessEnsureFrame(WindowPtr pWin) { ScreenPtr pScreen = pWin->drawable.pScreen; - RootlessWindowRec *winRec; RegionRec shape; RegionPtr pShape = NULL; @@ -376,8 +375,7 @@ RootlessEnsureFrame(WindowPtr pWin) if (pWin->drawable.class != InputOutput) return NULL; - winRec = malloc(sizeof(RootlessWindowRec)); - + RootlessWindowRec *winRec = calloc(1, sizeof(RootlessWindowRec)); if (!winRec) return NULL; diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index d3702f523..dbd794b53 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -111,7 +111,6 @@ static void shadowCloseScreen(CallbackListPtr *pcbl, ScreenPtr pScreen, void *un Bool shadowSetup(ScreenPtr pScreen) { - shadowBufPtr pBuf; if (!dixRegisterPrivateKey(&shadowScrPrivateKeyRec, PRIVATE_SCREEN, 0)) return FALSE; @@ -119,7 +118,7 @@ shadowSetup(ScreenPtr pScreen) if (!DamageSetup(pScreen)) return FALSE; - pBuf = malloc(sizeof(shadowBufRec)); + shadowBufPtr pBuf = calloc(1, sizeof(shadowBufRec)); if (!pBuf) return FALSE; pBuf->pDamage = DamageCreate((DamageReportFunc) NULL,