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

Coverity Prevent: RESOURCE_LEAK in xf86CrtcSetInitialGamma

This commit is contained in:
Oliver McFadden 2009-07-16 18:50:22 +03:00
parent 464e8ad733
commit 66eabbebaf
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/xfree86/modes/xf86Crtc.c
View File

@ -2216,10 +2216,13 @@ xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green,
blue = green + size; blue = green + size;
/* Only cause warning if user wanted gamma to be set. */ /* Only cause warning if user wanted gamma to be set. */
if (!crtc->funcs->gamma_set && (gamma_red != 1.0 || gamma_green != 1.0 || gamma_blue != 1.0)) if (!crtc->funcs->gamma_set && (gamma_red != 1.0 || gamma_green != 1.0 || gamma_blue != 1.0)) {
free(red);
return FALSE; return FALSE;
else if (!crtc->funcs->gamma_set) } else if (!crtc->funcs->gamma_set) {
free(red);
return TRUE; return TRUE;
}
/* At this early stage none of the randr-interface stuff is up. /* At this early stage none of the randr-interface stuff is up.
* So take the default gamma size for lack of something better. * So take the default gamma size for lack of something better.
@ -2245,8 +2248,10 @@ xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green,
} }
/* Default size is 256, so anything else is failure. */ /* Default size is 256, so anything else is failure. */
if (size != crtc->gamma_size) if (size != crtc->gamma_size) {
free(red);
return FALSE; return FALSE;
}
crtc->gamma_size = size; crtc->gamma_size = size;
memcpy (crtc->gamma_red, red, crtc->gamma_size * sizeof (CARD16)); memcpy (crtc->gamma_red, red, crtc->gamma_size * sizeof (CARD16));