Attachment 6781 Details for Bug 8099 – probably known, but anyway...

[patch] probably known, but anyway...

xkb.leak.patch (text/plain), 1.03 KB, created by Caolán McNamara on 2006-09-01 06:22:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolán McNamara

Created: 2006-09-01 06:22:55 UTC

Size: 1.03 KB

patch

obsolete

>--- libX11-1.0.3/src/xkb/XKBGeom.c.orig	2006-09-01 13:52:10.000000000 +0100
>+++ libX11-1.0.3/src/xkb/XKBGeom.c	2006-09-01 14:19:18.000000000 +0100
>@@ -255,9 +255,15 @@
> 	char *name,*value;
> 	ok= True;
> 	for (i=0;(i<rep->nProperties)&&ok;i++) {
>+	    name=NULL;
>+	    value=NULL;
> 	    ok= _XkbGetReadBufferCountedString(buf,&name)&&ok;
> 	    ok= _XkbGetReadBufferCountedString(buf,&value)&&ok;
> 	    ok= ok&&(XkbAddGeomProperty(geom,name,value)!=NULL);
>+	    if (name)
>+		_XkbFree(name);
>+	    if (value)
>+		_XkbFree(value);
> 	}
> 	if (ok)	rtrn= Success;
> 	else	rtrn= BadLength;
>@@ -300,10 +306,15 @@
> 	register int i;
> 	char *spec;
> 	for (i=0;i<rep->nColors;i++) {
>+	    spec = NULL;
> 	    if (!_XkbGetReadBufferCountedString(buf,&spec))
>-		return BadLength;
>-	    if (XkbAddGeomColor(geom,spec,geom->num_colors)==NULL)
>-		return BadAlloc;
>+		rtrn = BadLength;
>+	    else if (XkbAddGeomColor(geom,spec,geom->num_colors)==NULL)
>+		rtrn = BadAlloc;
>+	    if (spec)
>+		_XkbFree(spec);
>+	    if (rtrn != Success)
>+		return rtrn;
> 	}
> 	return Success;
>     }

Actions: View | Splinter Review

Attachments on bug 8099: 6781

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.