summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2004-03-26 16:15:54 +0000
committerKeith Packard <keithp@keithp.com>2004-03-26 16:15:54 +0000
commit64f5c2feae64186811a9612ee164c2e36e2fdc7a (patch)
tree9afc8eb5f2496b618580a441016b6a188f4ce2c7
parent19dccd6930635aa4522c75cc6122e93cc552e3cc (diff)
64. Patch RenderAddGlyphs to handle multiple glyphs and avoid memory error.
Bugzilla #349. (Stephen McCamant, applied by Keith Packard)
-rw-r--r--render/render.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/render/render.c b/render/render.c
index d4b95941c..542599adf 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.1.4.3 2004/02/25 21:47:08 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.1.4.3.2.2 2004/03/04 17:48:45 eich Exp $ */
/*
* $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $
*
@@ -1123,8 +1123,10 @@ ProcRenderAddGlyphs (ClientPtr client)
goto bail;
}
glyphs = glyphsBase;
- while (nglyphs--)
+ while (nglyphs--) {
AddGlyph (glyphSet, glyphs->glyph, glyphs->id);
+ glyphs++;
+ }
if (glyphsBase != glyphsLocal)
DEALLOCATE_LOCAL (glyphsBase);