diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:55 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:55 +0200 |
| commit | c4e7705d299fcfc058baaa0867e1a1e29d626c6f (patch) | |
| tree | 5f2997df7336d13a9b5fa5648a1253801dad4b8e /nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c | |
| parent | c9983230f1f37db868f628856122739566a9286d (diff) | |
| download | nx-libs-c4e7705d299fcfc058baaa0867e1a1e29d626c6f.tar.gz nx-libs-c4e7705d299fcfc058baaa0867e1a1e29d626c6f.tar.bz2 nx-libs-c4e7705d299fcfc058baaa0867e1a1e29d626c6f.zip | |
Imported nxagent-3.2.0-7.tar.gznxagent/3.2.0-7
Summary: Imported nxagent-3.2.0-7.tar.gz
Keywords:
Imported nxagent-3.2.0-7.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c b/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c index 06dabddaa..f51a8bce9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c +++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c @@ -69,6 +69,17 @@ #undef DEBUG #undef TEST +#else + +#include "picturestr.h" +#include "glyphstr.h" + +#endif + +#if HAVE_STDINT_H +#include <stdint.h> +#elif !defined(UINT32_MAX) +#define UINT32_MAX 0xffffffffU #endif /* @@ -401,8 +412,12 @@ AllocateGlyph (xGlyphInfo *gi, int fdepth) { int size; GlyphPtr glyph; - - size = gi->height * PixmapBytePad (gi->width, glyphDepths[fdepth]); + size_t padded_width; + + padded_width = PixmapBytePad (gi->width, glyphDepths[fdepth]); + if (gi->height && padded_width > (UINT32_MAX - sizeof(GlyphRec))/gi->height) + return 0; + size = gi->height * padded_width; glyph = (GlyphPtr) xalloc (size + sizeof (GlyphRec)); if (!glyph) return 0; |