mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-28 05:46:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash when the received message is invalid UTF8

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2014-10-27 10:49:06 +01:00
parent f8d29baf03
commit b4e18d46ce
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Classes/LinphoneUI/UIChatRoomCell.m
View file

@ -105,6 +105,18 @@ static UIFont *CELL_FONT = nil;
} }
+ (NSString*)decodeTextMessage:(const char*)text {
NSString* decoded = [NSString stringWithUTF8String:text];
if( decoded == nil ){
// couldn't decode the string as UTF8, do a lossy conversion
decoded = [NSString stringWithCString:text encoding:NSASCIIStringEncoding];
if( decoded == nil ){
decoded = @"(invalid string)";
}
}
return decoded;
}
- (void)update { - (void)update {
if(chat == nil) { if(chat == nil) {
[LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update chat room cell: null chat"]; [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update chat room cell: null chat"];
@ -151,15 +163,19 @@ static UIFont *CELL_FONT = nil;
} else { } else {
// simple text message // simple text message
[messageText setHidden:FALSE]; [messageText setHidden:FALSE];
if (text ){ if ( text ){
NSString* nstext = [UIChatRoomCell decodeTextMessage:text];
/* We need to use an attributed string here so that data detector don't mess /* We need to use an attributed string here so that data detector don't mess
* with the text style. See http://stackoverflow.com/a/20669356 */ * with the text style. See http://stackoverflow.com/a/20669356 */
NSAttributedString* attr_text = [[NSAttributedString alloc] NSAttributedString* attr_text = [[NSAttributedString alloc]
initWithString:[NSString stringWithUTF8String:text] initWithString:nstext
attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:17.0], attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:17.0],
NSForegroundColorAttributeName:[UIColor darkGrayColor]}]; NSForegroundColorAttributeName:[UIColor darkGrayColor]}];
messageText.attributedText = attr_text; messageText.attributedText = attr_text;
[attr_text release]; [attr_text release];
} else { } else {
messageText.text = @""; messageText.text = @"";
} }
@ -225,7 +241,7 @@ static UIFont *CELL_FONT = nil;
CGSize messageSize; CGSize messageSize;
const char* url = linphone_chat_message_get_external_body_url(chat); const char* url = linphone_chat_message_get_external_body_url(chat);
const char* text = linphone_chat_message_get_text(chat); const char* text = linphone_chat_message_get_text(chat);
NSString* messageText = text ? [NSString stringWithUTF8String:text] : @""; NSString* messageText = text ? [UIChatRoomCell decodeTextMessage:text] : @"";
if(url == nil) { if(url == nil) {
if(CELL_FONT == nil) { if(CELL_FONT == nil) {
CELL_FONT = [UIFont systemFontOfSize:CELL_FONT_SIZE]; CELL_FONT = [UIFont systemFontOfSize:CELL_FONT_SIZE];