From e868a001f951599d480baee752c226b9cff63875 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 22 Jan 2003 23:13:24 +0000 Subject: [PATCH] do not read sizeof(long) off the X connection. The X protocol does not 2003-01-22 Havoc Pennington * src/async-getprop.c (async_get_property_handler): do not read sizeof(long) off the X connection. The X protocol does not vary by architecture. Fixes longstanding hang on all 64-bit platforms. --- ChangeLog | 6 ++++++ src/async-getprop.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9caedbd4a..95f5bcdcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-01-22 Havoc Pennington + + * src/async-getprop.c (async_get_property_handler): do not read + sizeof(long) off the X connection. The X protocol does not vary + by architecture. Fixes longstanding hang on all 64-bit platforms. + 2003-01-22 Havoc Pennington * src/tools/Makefile.am: fix conditional so we get diff --git a/src/async-getprop.c b/src/async-getprop.c index 4b9f55944..3b95f1339 100644 --- a/src/async-getprop.c +++ b/src/async-getprop.c @@ -347,7 +347,7 @@ async_get_property_handler (Display *dpy, break; case 32: - nbytes = reply->nItems * sizeof (long); + nbytes = reply->nItems * sizeof (CARD32); netbytes = reply->nItems << 2; if (nbytes + 1 > 0 && (task->data = (unsigned char *) Xmalloc ((unsigned)nbytes + 1)))