summaryrefslogtreecommitdiff
path: root/src/XrrOutput.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-03 23:29:22 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-03 23:44:50 -0700
commit1c7ad6773ce6be00dcd6e51e9be08f203abe5071 (patch)
tree935094e79765854919a6c48843305d15873dec3f /src/XrrOutput.c
parent99a63d10cbbab7d69a52d25d78795a3278506ea9 (diff)
downloadxorg-lib-libXrandr-1c7ad6773ce6be00dcd6e51e9be08f203abe5071.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>
Diffstat (limited to 'src/XrrOutput.c')
-rw-r--r--src/XrrOutput.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/XrrOutput.c b/src/XrrOutput.c
index f13a932..4df894e 100644
--- a/src/XrrOutput.c
+++ b/src/XrrOutput.c
@@ -81,7 +81,7 @@ XRRGetOutputInfo (Display *dpy, XRRScreenResources *resources, RROutput output)
xoi = (XRROutputInfo *) Xmalloc(rbytes);
if (xoi == NULL) {
- _XEatData (dpy, (unsigned long) nbytes);
+ _XEatDataWords (dpy, rep.length - (OutputInfoExtra >> 2));
UnlockDisplay (dpy);
SyncHandle ();
return NULL;