kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a segfault that can occur when mixing RENDER and non-RENDER fonts.

Browse source 
Obtained from:	XFree86 CVS
This commit is contained in:
Joe Marcus Clarke 2003-04-06 20:37:06 +00:00
parent 5a63a4d02a
commit 300ef05420
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=78452
4 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x11-fonts/Xft/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= Xft
PORTVERSION= 2.1
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= x11-fonts
MASTER_SITES= http://fontconfig.org/fontconfig/release/
DISTNAME= fcpackage.${PORTVERSION:S/./_/}

20
x11-fonts/Xft/files/patch-xftdraw.c Normal file
View file

@ -0,0 +1,20 @@
--- xftdraw.c 2002/10/11 17:53:02 1.25
+++ xftdraw.c 2003/04/03 22:25:50 1.26
@@ -724,7 +724,7 @@ XftDrawGlyphFontSpec (XftDraw *draw,
{
XftGlyphFontSpecRender (draw->dpy, _XftDrawOp (draw, color),
src, draw->render.pict,
- 0, 0, glyphs, i - start);
+ 0, 0, glyphs + start , i - start);
}
}
else
@@ -732,7 +732,7 @@ XftDrawGlyphFontSpec (XftDraw *draw,
while (i < len && !((XftFontInt *) glyphs[i].font)->format)
i++;
if (_XftDrawCorePrepare (draw, color))
- XftGlyphFontSpecCore (draw, color, glyphs, len);
+ XftGlyphFontSpecCore (draw, color, glyphs + start, i - start);
}
}
}

2
x11-fonts/libXft/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= Xft
PORTVERSION= 2.1
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= x11-fonts
MASTER_SITES= http://fontconfig.org/fontconfig/release/
DISTNAME= fcpackage.${PORTVERSION:S/./_/}

20
x11-fonts/libXft/files/patch-xftdraw.c Normal file
View file

@ -0,0 +1,20 @@
--- xftdraw.c 2002/10/11 17:53:02 1.25
+++ xftdraw.c 2003/04/03 22:25:50 1.26
@@ -724,7 +724,7 @@ XftDrawGlyphFontSpec (XftDraw *draw,
{
XftGlyphFontSpecRender (draw->dpy, _XftDrawOp (draw, color),
src, draw->render.pict,
- 0, 0, glyphs, i - start);
+ 0, 0, glyphs + start , i - start);
}
}
else
@@ -732,7 +732,7 @@ XftDrawGlyphFontSpec (XftDraw *draw,
while (i < len && !((XftFontInt *) glyphs[i].font)->format)
i++;
if (_XftDrawCorePrepare (draw, color))
- XftGlyphFontSpecCore (draw, color, glyphs, len);
+ XftGlyphFontSpecCore (draw, color, glyphs + start, i - start);
}
}
}