diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-05-03 22:30:36 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-05-03 22:36:48 -0700 |
| commit | 15ec6d1d0bb8c4cb24a190ed34e63312a0623670 (patch) | |
| tree | 1043f65a8d3bf9ddcac13053ca1277d97d6a0a8e | |
| parent | 41aab7d289aba2aaf3839e96d0c9e2f15ede4bd1 (diff) | |
| download | xorg-lib-libXp-15ec6d1d0bb8c4cb24a190ed34e63312a0623670.tar.gz | |
Use _XEatDataWords to avoid overflow of rep.length bit shifting
rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/XpExtUtil.h | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 50b029c..16b966c 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,12 @@ AC_PROG_LIBTOOL # Check for X and print proto PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto) +# Check for _XEatDataWords function that may be patched into older Xlib release +SAVE_LIBS="$LIBS" +LIBS="$XPRINT_LIBS" +AC_CHECK_FUNCS([_XEatDataWords]) +LIBS="$SAVE_LIBS" + AC_CONFIG_FILES([Makefile src/Makefile man/Makefile diff --git a/src/XpExtUtil.h b/src/XpExtUtil.h index d479a95..1889825 100644 --- a/src/XpExtUtil.h +++ b/src/XpExtUtil.h @@ -48,6 +48,20 @@ extern char *_xpstrdup( const char * /* str */ ); +#ifndef HAVE__XEATDATAWORDS +#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */ +#include <limits.h> + +static inline void _XEatDataWords(Display *dpy, unsigned long n) +{ +# ifndef LONG64 + if (n >= (ULONG_MAX >> 2)) + _XIOError(dpy); +# endif + _XEatData (dpy, n << 2); +} +#endif + _XFUNCPROTOEND #endif /* _XPEXTUTIL_H */ |