RPCS3/hidapi
1
0
Fork 0
mirror of https://github.com/RPCS3/hidapi.git synced 2026-07-19 21:43:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

mac: Fix string handling

Browse Source 
There were errors regarding the length of strings in conversion from CFString
to wchar_t.

Thanks to github user nikolajsheller for pointing this out in pull request #80.
This commit is contained in:
Alan Ott
2012-11-26 13:59:33 -05:00
parent 54d32f6aa3
commit dc6c170672
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mac/hid.c
+12 -4
View File
@@ -244,10 +244,14 @@ static int get_string_property(IOHIDDeviceRef device, CFStringRef prop, wchar_t
(char)'?',
FALSE,
(UInt8*)buf,
len,
len * sizeof(wchar_t),
&used_buf_len);
buf[chars_copied] = 0;
if (chars_copied == len)
buf[len] = 0; /* len is decremented above */
else
buf[chars_copied] = 0;
return 0;
}
else
@@ -271,7 +275,7 @@ static int get_string_property_utf8(IOHIDDeviceRef device, CFStringRef prop, cha
CFIndex str_len = CFStringGetLength(str);
CFRange range;
range.location = 0;
range.length = (str_len > len)? len: str_len;
range.length = str_len;
CFIndex used_buf_len;
CFIndex chars_copied;
chars_copied = CFStringGetBytes(str,
@@ -283,7 +287,11 @@ static int get_string_property_utf8(IOHIDDeviceRef device, CFStringRef prop, cha
len,
&used_buf_len);
buf[chars_copied] = 0;
if (used_buf_len == len)
buf[len] = 0; /* len is decremented above */
else
buf[used_buf_len] = 0;
return used_buf_len;
}
else