diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-03-25 13:22:42 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-03-25 13:22:42 +0000 |
| commit | 8d1e7d0c54fd7d2507a0ebba89a5fa7ffaadc9ea (patch) | |
| tree | ed94a36e42f177e769aebbc2ad565d9e4bec58d3 /lib/libXfont/src | |
| parent | 42710414e901768bd661bb644f844e4704f4afce (diff) | |
Revert local debug stuff that wasn't meant to be committed.
Diffstat (limited to 'lib/libXfont/src')
| -rw-r--r-- | lib/libXfont/src/bitmap/bdfread.c | 11 | ||||
| -rw-r--r-- | lib/libXfont/src/fontfile/fontdir.c | 8 |
2 files changed, 0 insertions, 19 deletions
diff --git a/lib/libXfont/src/bitmap/bdfread.c b/lib/libXfont/src/bitmap/bdfread.c index a6f0c1e7e..acb77e949 100644 --- a/lib/libXfont/src/bitmap/bdfread.c +++ b/lib/libXfont/src/bitmap/bdfread.c @@ -65,12 +65,6 @@ from The Open Group. #include <X11/fonts/bitmap.h> #include <X11/fonts/bdfint.h> -#if HAVE_STDINT_H -#include <stdint.h> -#elif !defined(INT32_MAX) -#define INT32_MAX 0x7fffffff -#endif - #define INDICES 256 #define MAXENCODING 0xFFFF #define BDFLINELEN 1024 @@ -294,11 +288,6 @@ bdfReadCharacters(FontFilePtr file, FontPtr pFont, bdfFileState *pState, bdfError("invalid number of CHARS in BDF file\n"); return (FALSE); } - if (nchars > INT32_MAX / sizeof(CharInfoRec)) { - bdfError("Couldn't allocate pCI (%d*%d)\n", nchars, - sizeof(CharInfoRec)); - goto BAILOUT; - } ci = (CharInfoPtr) xalloc(nchars * sizeof(CharInfoRec)); if (!ci) { bdfError("Couldn't allocate pCI (%d*%d)\n", nchars, diff --git a/lib/libXfont/src/fontfile/fontdir.c b/lib/libXfont/src/fontfile/fontdir.c index cf68a547c..aae1f2e25 100644 --- a/lib/libXfont/src/fontfile/fontdir.c +++ b/lib/libXfont/src/fontfile/fontdir.c @@ -38,17 +38,9 @@ in this Software without prior written authorization from The Open Group. #include <X11/fonts/fntfilst.h> #include <X11/keysym.h> -#if HAVE_STDINT_H -#include <stdint.h> -#elif !defined(INT32_MAX) -#define INT32_MAX 0x7fffffff -#endif - Bool FontFileInitTable (FontTablePtr table, int size) { - if (size < 0 || (size > INT32_MAX/sizeof(FontEntryRec))) - return FALSE; if (size) { table->entries = (FontEntryPtr) xalloc(sizeof(FontEntryRec) * size); |