Attachment 5958 Details for Bug 7259 – proposed patch

[patch] proposed patch

Xft-fixes.patch (text/plain), 2.14 KB, created by Kjartan Maraas on 2006-06-17 11:27:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kjartan Maraas

Created: 2006-06-17 11:27:11 UTC

Size: 2.14 KB

patch

obsolete

>? warnings
>? warnings-icc
>? xft-config.1
>Index: xftcore.c
>===================================================================
>RCS file: /cvs/xlibs/Xft/xftcore.c,v
>retrieving revision 1.15
>diff -u -p -r1.15 xftcore.c
>--- xftcore.c	15 Apr 2004 01:45:47 -0000	1.15
>+++ xftcore.c	17 Jun 2006 18:26:56 -0000
>@@ -921,7 +921,7 @@ _XftGlyphDefault (Display *dpy, XftFont 
>     if (XftFontCheckGlyph (dpy, public, FcTrue, 0, missing, &nmissing))
> 	glyphs_loaded = FcTrue;
>     if (nmissing)
>-	XftFontLoadGlyphs (dpy, public, FcTrue, missing, nmissing);
>+	XftFontLoadGlyphs (dpy, public, glyphs_loaded, missing, nmissing);
>     return font->glyphs[0];
> }
> 
>Index: xftdraw.c
>===================================================================
>RCS file: /cvs/xlibs/Xft/xftdraw.c,v
>retrieving revision 1.31
>diff -u -p -r1.31 xftdraw.c
>--- xftdraw.c	15 Apr 2004 01:45:47 -0000	1.31
>+++ xftdraw.c	17 Jun 2006 18:26:57 -0000
>@@ -210,7 +210,7 @@ _XftDrawFormat (XftDraw	*draw)
> {
>     XftDisplayInfo  *info = _XftDisplayInfoGet (draw->dpy, True);
> 
>-    if (!info->hasRender)
>+    if (!info || !info->hasRender)
> 	return 0;
> 
>     if (draw->visual == 0)
>Index: xftrender.c
>===================================================================
>RCS file: /cvs/xlibs/Xft/xftrender.c,v
>retrieving revision 1.18
>diff -u -p -r1.18 xftrender.c
>--- xftrender.c	15 Apr 2004 01:45:47 -0000	1.18
>+++ xftrender.c	17 Jun 2006 18:26:57 -0000
>@@ -518,7 +518,7 @@ XftGlyphFontSpecRender (Display			    *d
> 	    break;
> 	}
>     }
>-    if (i == nglyphs)
>+    if (i == nglyphs || !firstFont)
> 	goto bail2;
>     glyph = firstFont->glyphs[g];
>     format = firstFont->format;
>Index: xftxlfd.c
>===================================================================
>RCS file: /cvs/xlibs/Xft/xftxlfd.c,v
>retrieving revision 1.11
>diff -u -p -r1.11 xftxlfd.c
>--- xftxlfd.c	15 Apr 2004 01:45:47 -0000	1.11
>+++ xftxlfd.c	17 Jun 2006 18:26:57 -0000
>@@ -128,8 +128,10 @@ XftXlfdParse (const char *xlfd_orig, FcB
>     
>     save = (char *) malloc (strlen (foundry) + 1);
>     
>-    if (!save)
>+    if (!save) {
>+	FcPatternDestroy (pat);
> 	return 0;
>+    }
> 
>     if (!FcPatternAddString (pat, XFT_XLFD, (FcChar8 *) xlfd_orig)) goto bail;
>

Actions: View | Splinter Review

Attachments on bug 7259: 5958

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.