andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: pbproxy: Fix another STRING bug.

Browse Source 
Fix the usage of the NSString cStringUsingEncoding: - it doesn't NUL
terminate the string, which lead to a bus error.  So, we use
lengthOfBytesUsingEncoding: to get the length in bytes instead of
strlen().
(cherry picked from commit 6333d619e7)
This commit is contained in:
George Peter Staplin 2008-09-25 14:16:20 -06:00 committed by Jeremy Huddleston
parent edfa3f8233
commit eb8be3e90a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -528,7 +528,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
pbtypes = [pb types]; pbtypes = [pb types];
if (pbtypes) if (pbtypes)
{ {
long list[6]; long list[6]; /* Don't forget to increase this if we handle more types! */
long count = 0; long count = 0;
if ([pbtypes containsObject:NSStringPboardType]) if ([pbtypes containsObject:NSStringPboardType])
@ -619,7 +619,8 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
{ {
DB ("Latin-1\n"); DB ("Latin-1\n");
bytes = [data cStringUsingEncoding:NSISOLatin1StringEncoding]; bytes = [data cStringUsingEncoding:NSISOLatin1StringEncoding];
length = strlen (bytes); /*WARNING: bytes is not NUL-terminated. */
length = [data lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding];
} }
DB ("e->target %s\n", XGetAtomName (x_dpy, e->target)); DB ("e->target %s\n", XGetAtomName (x_dpy, e->target));
@ -760,7 +761,6 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
[self send_reply:&reply]; [self send_reply:&reply];
return; return;
} }
/*FIXME Why is [bmimage retainCount] 2 here? */
DB ("bmimage retainCount after initWithData %u\n", [bmimage retainCount]); DB ("bmimage retainCount after initWithData %u\n", [bmimage retainCount]);