[PATCH 1/2] [libX11] xcms/LRGB: don't double-free property_return

Alan Coopersmith alan.coopersmith at Sun.COM
Tue Feb 8 21:35:52 PST 2011


On 02/ 4/11 01:43 AM, Erkki Seppälä wrote:
> From: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
> 
> property_return was free'd before and in the case the conditional is
> true, the call to XcmsGetProperty failed which means that
> property_return wasn't set so there is no need to free it again.
> 
> Double free of pointer "property_return" in call to "free"
> 
> Reviewed-by: Erkki Seppälä <erkki.seppala at vincit.fi>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira at nokia.com>
> ---
>  src/xcms/LRGB.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/src/xcms/LRGB.c b/src/xcms/LRGB.c
> index 750c492..2dca82e 100644
> --- a/src/xcms/LRGB.c
> +++ b/src/xcms/LRGB.c
> @@ -573,7 +573,6 @@ LINEAR_RGB_InitSCCData(
>      if (CorrectAtom == None ||
>  	!_XcmsGetProperty (dpy, RootWindow(dpy, screenNumber), CorrectAtom,
>  	   &format_return, &nitems, &nbytes_return, &property_return)) {
> -	Xfree ((char *)property_return);
>  	goto FreeSCCData;
>      }
>  

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System


More information about the xorg-devel mailing list