frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xf86SbusCmapLoadPalette: Delay malloc until needed, avoiding leak on error 

Reported with other leaks found by cppcheck in bugzilla #50281
https://bugs.freedesktop.org/show_bug.cgi?id=50281

V2: check for malloc failure

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith 2013-02-10 10:24:59 -08:00
parent 6bca0184d1
commit 174ccd8493
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/common/xf86sbusBus.c
View File

@ -641,14 +641,16 @@ xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
int i, index; int i, index;
sbusCmapPtr cmap; sbusCmapPtr cmap;
struct fbcmap fbcmap; struct fbcmap fbcmap;
unsigned char *data = malloc(numColors * 3); unsigned char *data;
cmap = SBUSCMAPPTR(pScrn->pScreen); cmap = SBUSCMAPPTR(pScrn->pScreen);
if (!cmap) if (!cmap)
return; return;
fbcmap.count = 0; fbcmap.count = 0;
fbcmap.index = indices[0]; fbcmap.index = indices[0];
fbcmap.red = data; fbcmap.red = data = malloc(numColors * 3);
if (!data)
return;
fbcmap.green = data + numColors; fbcmap.green = data + numColors;
fbcmap.blue = fbcmap.green + numColors; fbcmap.blue = fbcmap.green + numColors;
for (i = 0; i < numColors; i++) { for (i = 0; i < numColors; i++) {