diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-01-22 23:13:24 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2003-01-22 23:13:24 +0000 |
| commit | e868a001f951599d480baee752c226b9cff63875 (patch) | |
| tree | 67dd5f1b1ca376c1810ef05999ae885489dd6c0c | |
| parent | a8526454b0e8d67ae71348a0f6f434841e73c9bf (diff) | |
| download | metacity-e868a001f951599d480baee752c226b9cff63875.tar.gz | |
do not read sizeof(long) off the X connection. The X protocol does not
2003-01-22 Havoc Pennington <hp@redhat.com>
* 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 | 6 | ||||
| -rw-r--r-- | src/async-getprop.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2003-01-22 Havoc Pennington <hp@redhat.com> + * 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> + * 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))) |