hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-18 19:52:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master'

Browse source
This commit is contained in:
Peter Hutterer 2007-01-28 17:18:57 +10:30 • committed by Peter Hutterer
commit 15a81b6325
61 changed files with 5127 additions and 1002 deletions
Download patch file Download diff file Expand all files Collapse all files

15
render/render.c
View file

@ -47,6 +47,12 @@
#include <X11/Xfuncproto.h>
#include "cursorstr.h"
#if HAVE_STDINT_H
#include <stdint.h>
#elif !defined(UINT32_MAX)
#define UINT32_MAX 0xffffffffU
#endif
static int ProcRenderQueryVersion (ClientPtr pClient);
static int ProcRenderQueryPictFormats (ClientPtr pClient);
static int ProcRenderQueryPictIndexValues (ClientPtr pClient);
@ -1105,11 +1111,14 @@ ProcRenderAddGlyphs (ClientPtr client)
}
nglyphs = stuff->nglyphs;
if (nglyphs > UINT32_MAX / sizeof(GlyphNewRec))
return BadAlloc;
if (nglyphs <= NLOCALGLYPH)
glyphsBase = glyphsLocal;
else
{
glyphsBase = (GlyphNewPtr) ALLOCATE_LOCAL (nglyphs * sizeof (GlyphNewRec));
glyphsBase = (GlyphNewPtr) Xalloc (nglyphs * sizeof (GlyphNewRec));
if (!glyphsBase)
return BadAlloc;
}
@ -1166,7 +1175,7 @@ ProcRenderAddGlyphs (ClientPtr client)
}
if (glyphsBase != glyphsLocal)
DEALLOCATE_LOCAL (glyphsBase);
Xfree (glyphsBase);
return client->noClientException;
bail:
while (glyphs != glyphsBase)
@ -1175,7 +1184,7 @@ bail:
xfree (glyphs->glyph);
}
if (glyphsBase != glyphsLocal)
DEALLOCATE_LOCAL (glyphsBase);
Xfree (glyphsBase);
return err;
}