summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--src/async-getprop.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c0aaa8a..3b5ed62e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
(not for 2.2.0)
+ * 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 <hp@redhat.com>
+
+ (not for 2.2.0)
+
* src/tools/Makefile.am: fix conditional so we get
metacity-properties.c in the distribution #103071
diff --git a/src/async-getprop.c b/src/async-getprop.c
index 4b9f5594..3b95f133 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)))