From 74b4118dae529d09abcec2a8d285c01e7a515a4a Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Tue, 18 Jun 2019 16:17:21 +0200 Subject: [PATCH] fix crash when cstring is null --- Classes/HistoryListTableView.m | 2 +- Classes/LinphoneManager.m | 2 +- Classes/Utils/Utils.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Classes/HistoryListTableView.m b/Classes/HistoryListTableView.m index 4961d6b21..b6e93aef7 100644 --- a/Classes/HistoryListTableView.m +++ b/Classes/HistoryListTableView.m @@ -192,7 +192,7 @@ [dict setObject:[NSString stringWithUTF8String:linphone_call_log_get_call_id(log)] forKey:@"id"]; - [dict setObject:[NSString stringWithUTF8String:linphone_address_get_display_name(address)?:linphone_address_get_username(address)] + [dict setObject:[NSString stringWithUTF8String:linphone_address_get_display_name(address)?:(linphone_address_get_username(address)?:"unknown")] forKey:@"display"]; UIImage *avatar = [FastAddressBook imageForAddress:address]; if (avatar) { diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 723824d63..f11a54225 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1075,7 +1075,7 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, LinphoneAut return; } - NSString *realm = [NSString stringWithUTF8String:realmC]; + NSString *realm = [NSString stringWithUTF8String:realmC?:domainC]; NSString *username = [NSString stringWithUTF8String:usernameC]; NSString *domain = [NSString stringWithUTF8String:domainC]; alertView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Authentification needed", nil) diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m index 42533f69f..4a74e2a97 100644 --- a/Classes/Utils/Utils.m +++ b/Classes/Utils/Utils.m @@ -496,7 +496,7 @@ + (NSString *)recordingFilePathFromCall:(const LinphoneAddress *)iaddr { NSString *filepath = @"recording_"; const char *address = linphone_address_get_username(iaddr); - filepath = [filepath stringByAppendingString:[NSString stringWithCString:address encoding:NSUTF8StringEncoding]]; + filepath = [filepath stringByAppendingString:address? [NSString stringWithCString:address encoding:NSUTF8StringEncoding] : @"unknown"]; NSDate * now = [NSDate date]; NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init]; [dateFormat setDateFormat:@"E-d-MMM-yyyy-HH-mm-ss"];