xserver/render render.c,1.29,1.30

Keith Packard xserver-commit at pdx.freedesktop.org
Fri Mar 19 08:00:04 PST 2004


Committed by: keithp

Update of /cvs/xserver/xserver/render
In directory pdx:/tmp/cvs-serv19633/render

Modified Files:
	render.c 
Log Message:
2004-03-19  Keith Packard  <keithp at keithp.com>

	* render/render.c: (ProcRenderAddGlyphs):
	Multiple glyphs in RenderAddGlyphs cause malloc() corruption
	Bug #349, smcc at MIT.EDU (Stephen McCamant)


Index: render.c
===================================================================
RCS file: /cvs/xserver/xserver/render/render.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- a/render.c	11 Mar 2004 01:19:21 -0000	1.29
+++ b/render.c	19 Mar 2004 16:00:02 -0000	1.30
@@ -1122,7 +1122,10 @@
     }
     glyphs = glyphsBase;
     while (nglyphs--)
+    {
 	AddGlyph (glyphSet, glyphs->glyph, glyphs->id);
+	++glyphs;
+    }
 
     if (glyphsBase != glyphsLocal)
 	DEALLOCATE_LOCAL (glyphsBase);




More information about the xserver-commit mailing list