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

fix crash when cstring is null

Browse source
This commit is contained in:
Danmei Chen 2019-06-18 16:17:21 +02:00
parent 57662b35ed
commit 74b4118dae
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/HistoryListTableView.m
View file

@ -192,7 +192,7 @@
[dict setObject:[NSString stringWithUTF8String:linphone_call_log_get_call_id(log)] [dict setObject:[NSString stringWithUTF8String:linphone_call_log_get_call_id(log)]
forKey:@"id"]; 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"]; forKey:@"display"];
UIImage *avatar = [FastAddressBook imageForAddress:address]; UIImage *avatar = [FastAddressBook imageForAddress:address];
if (avatar) { if (avatar) {

2
Classes/LinphoneManager.m
View file

@ -1075,7 +1075,7 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, LinphoneAut
return; return;
} }
NSString *realm = [NSString stringWithUTF8String:realmC]; NSString *realm = [NSString stringWithUTF8String:realmC?:domainC];
NSString *username = [NSString stringWithUTF8String:usernameC]; NSString *username = [NSString stringWithUTF8String:usernameC];
NSString *domain = [NSString stringWithUTF8String:domainC]; NSString *domain = [NSString stringWithUTF8String:domainC];
alertView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Authentification needed", nil) alertView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Authentification needed", nil)

2
Classes/Utils/Utils.m
View file

@ -496,7 +496,7 @@
+ (NSString *)recordingFilePathFromCall:(const LinphoneAddress *)iaddr { + (NSString *)recordingFilePathFromCall:(const LinphoneAddress *)iaddr {
NSString *filepath = @"recording_"; NSString *filepath = @"recording_";
const char *address = linphone_address_get_username(iaddr); 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]; NSDate * now = [NSDate date];
NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init]; NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init];
[dateFormat setDateFormat:@"E-d-MMM-yyyy-HH-mm-ss"]; [dateFormat setDateFormat:@"E-d-MMM-yyyy-HH-mm-ss"];