From 8b54fb0f6ccae1d94c4cf55c6136cebf3bb703c6 Mon Sep 17 00:00:00 2001 From: Paul Cartier Date: Wed, 27 May 2020 11:02:06 +0200 Subject: [PATCH] fix crash when linphone_core_get_video_device() is NULL --- Classes/AssistantView.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index accaa2ae7..4e52dcd52 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -1471,14 +1471,14 @@ void assistant_is_account_linked(LinphoneAccountCreator *creator, LinphoneAccoun [[UIDevice currentDevice] setValue:value forKey:@"orientation"]; //[UIViewController attemptRotationToDeviceOrientation]; AVCaptureDevice *backCamera = [AVCaptureDevice defaultDeviceWithDeviceType:AVCaptureDeviceTypeBuiltInWideAngleCamera mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionBack]; - if (![[NSString stringWithUTF8String:linphone_core_get_video_device(LC)] containsString:[backCamera uniqueID]]) { + if (![[NSString stringWithUTF8String:linphone_core_get_video_device(LC) ?: ""] containsString:[backCamera uniqueID]]) { bctbx_list_t *deviceList = linphone_core_get_video_devices_list(LC); NSMutableArray *devices = [NSMutableArray array]; while (deviceList) { char *data = deviceList->data; - [devices addObject:[NSString stringWithUTF8String:data]]; + if (data) [devices addObject:[NSString stringWithUTF8String:data]]; deviceList = deviceList->next; } bctbx_list_free(deviceList);