From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 31 Jan 2006 03:00:14 +0000 (+0000)
Subject: s/malloc/calloc/, fix mem leak
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=111281f1fc0b51a224755057e8a0791e395d184a;p=mesa.git

s/malloc/calloc/, fix mem leak
---

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 280d6c811d9..37d5fcd0d3a 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -97,7 +97,7 @@ static rawImageRec *RawImageOpen(const char *fileName)
       swapFlag = GL_FALSE;
    }
 
-   raw = (rawImageRec *)malloc(sizeof(rawImageRec));
+   raw = (rawImageRec *)calloc(1, sizeof(rawImageRec));
    if (raw == NULL) {
       fprintf(stderr, "Out of memory!\n");
       return NULL;
@@ -148,12 +148,15 @@ static rawImageRec *RawImageOpen(const char *fileName)
 
 static void RawImageClose(rawImageRec *raw)
 {
-
    fclose(raw->file);
    free(raw->tmp);
    free(raw->tmpR);
    free(raw->tmpG);
    free(raw->tmpB);
+   if (raw->rowStart)
+      free(raw->rowStart);
+   if (raw->rowSize)
+      free(raw->rowSize);
    if (raw->sizeZ>3) {
       free(raw->tmpA);
    }