mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-09 06:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

use fallback to latin1 for invalid UTF8 names

Browse Source
This commit is contained in:
matthias.ringwald 2010-05-28 21:41:51 +00:00
parent 2277459341
commit 3a3bdd0105
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CocoaTouch/src/BTInquiryViewController.m
View File

@ -197,7 +197,18 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
if (!dev) break; if (!dev) break;
[dev setConnectionState:kBluetoothConnectionNotConnected]; [dev setConnectionState:kBluetoothConnectionNotConnected];
if (packet[2] == 0) { if (packet[2] == 0) {
// assert max lengh
packet[9+255] = 0;
// Bluetooth specification mandates UTF-8 encoding...
NSString *remoteName = [NSString stringWithUTF8String:(const char *) &packet[9]]; NSString *remoteName = [NSString stringWithUTF8String:(const char *) &packet[9]];
// but fallback to latin-1 for non-standard products like old Microsoft Wireless Presenter
if (!remoteName){
remoteName = [NSString stringWithCString:(const char *) &packet[9]
encoding:NSISOLatin1StringEncoding];
}
[dev setName:remoteName]; [dev setName:remoteName];
if (deviceInfo) { if (deviceInfo) {
NSMutableDictionary *deviceDict = [deviceInfo objectForKey:[dev addressString]]; NSMutableDictionary *deviceDict = [deviceInfo objectForKey:[dev addressString]];