Merged over libXpm security fix provided by Chris Evans, Matthieu Herrb and

    Alan Coopersmith from release 6.8.1.
Fail during initialization with error if font/fontset is not set for
    widget. This prevents a sig11 later when the non-existent font/fontset
    structs are referenced.
Check if xf86Info.kbdProc pointer is really set before calling it on abort
    as this pointer won't be set if the new modular keyboard driver is used
    (Matthias Hopf).
Added new libs to the bindist control files.
Removed inclusion of unnecessary kernel header on Linux. This may fail in
    an -ansi environment.

1 files changed, 15 insertions, 3 deletions

diff --git a/src/XpmI.h b/src/XpmI.h
index 91f6cd9..5c5b900 100644
--- a/src/XpmI.h
+++ b/src/XpmI.h
@@ -86,6 +86,18 @@ extern FILE *popen();
 		boundCheckingCalloc((long)(nelem),(long) (elsize))
 #endif
 
+#if defined(SCO) || defined(__USLC__)
+#include <stdint.h>	/* For SIZE_MAX */
+#endif
+#include <limits.h>
+#ifndef SIZE_MAX
+# ifdef ULONG_MAX
+#  define SIZE_MAX ULONG_MAX
+# else 
+#  define SIZE_MAX UINT_MAX
+# endif
+#endif
+
 #define XPMMAXCMTLEN BUFSIZ
 typedef struct {
     unsigned int type;
@@ -187,9 +199,9 @@ typedef struct _xpmHashAtom {
 }      *xpmHashAtom;
 
 typedef struct {
-    int size;
-    int limit;
-    int used;
+    unsigned int size;
+    unsigned int limit;
+    unsigned int used;
     xpmHashAtom *atomTable;
 }      xpmHashTable;