diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-01-22 23:12:40 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2003-01-22 23:12:40 +0000 |
| commit | e1e75fce7db69c2b3424eaf8259fb0c07ae964a2 (patch) | |
| tree | 9168672cb8afba4d817688ebabe9680b00502f4e | |
| parent | 8737432b1b2b26f4aade360cb04d79bce568b6ab (diff) | |
| download | metacity-e1e75fce7db69c2b3424eaf8259fb0c07ae964a2.tar.gz | |
(not for 2.2.0)METACITY_2_4_21_90
2003-01-22 Havoc Pennington <hp@redhat.com>
(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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/async-getprop.c | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -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))) |