diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-05-01 23:58:39 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-05-23 08:13:25 -0700 |
| commit | 59b8e1388a687f871831ac5a9e0ac11de75e2516 (patch) | |
| tree | d2da4d43b4914089efdde02ace9613b41a937427 /src/XIint.h | |
| parent | 5d43d4914dcabb6de69859567061e99300e56ef4 (diff) | |
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>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/XIint.h')
| -rw-r--r-- | src/XIint.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/XIint.h b/src/XIint.h index 571bb23..3ddc3c5 100644 --- a/src/XIint.h +++ b/src/XIint.h @@ -83,4 +83,18 @@ next_block(void **ptr, int size) { return ret; } +#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 + #endif |