frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: pbproxy: LP64: Fix itteration through XGetWindowProperty where sizeof(long) != 4 

http://xquartz.macosforge.org/trac/ticket/476

Signed-off-by: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Emanuele Giaquinta 2011-04-25 10:38:17 -07:00 committed by Jeremy Huddleston
parent 0a60192a85
commit 72ed7551f4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/xquartz/pbproxy/x-selection.m
View File

@ -175,7 +175,12 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
#endif #endif
/* Format is the number of bits. */ /* Format is the number of bits. */
chunkbytesize = numitems * (format / 8); if (format == 8)
chunkbytesize = numitems;
else if (format == 16)
chunkbytesize = numitems * sizeof(short);
else if (format == 32)
chunkbytesize = numitems * sizeof(long);
#ifdef TEST #ifdef TEST
printf("chunkbytesize %zu\n", chunkbytesize); printf("chunkbytesize %zu\n", chunkbytesize);
@ -235,9 +240,9 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
return None; return None;
} }
for (i = 0, step = pdata->format >> 3; i < pdata->length; i += step) for (i = 0, step = sizeof(long); i < pdata->length; i += step)
{ {
a = (Atom)*(uint32_t *)(pdata->data + i); a = (Atom)*(long *)(pdata->data + i);
if (a == atoms->image_png) if (a == atoms->image_png)
{ {