From 8b7f74dd22a5b024892001fd5c67231baccf2ebd Mon Sep 17 00:00:00 2001 From: Minhyuk Kim Date: Fri, 3 Sep 2021 19:07:38 +0900 Subject: [PATCH] Fix crash on RTCPeerConnection.setRemote/LocalDescription --- sdk/objc/api/peerconnection/RTCPeerConnection.mm | 4 ++-- tools_webrtc/ios/build_ios_libs.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection.mm b/sdk/objc/api/peerconnection/RTCPeerConnection.mm index 05fe581d08..a9b0c7cd50 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnection.mm +++ b/sdk/objc/api/peerconnection/RTCPeerConnection.mm @@ -581,7 +581,7 @@ - (void)setLocalDescription:(RTC_OBJC_TYPE(RTCSessionDescription) *)sdp RTC_DCHECK(completionHandler != nil); rtc::scoped_refptr observer( new rtc::RefCountedObject<::SetSessionDescriptionObserver>(completionHandler)); - _peerConnection->SetLocalDescription(sdp.nativeDescription->Clone(), observer); + _peerConnection->SetLocalDescription(sdp.nativeDescription ? sdp.nativeDescription->Clone() : nullptr, observer); } - (void)setLocalDescriptionWithCompletionHandler: @@ -597,7 +597,7 @@ - (void)setRemoteDescription:(RTC_OBJC_TYPE(RTCSessionDescription) *)sdp RTC_DCHECK(completionHandler != nil); rtc::scoped_refptr observer( new rtc::RefCountedObject<::SetSessionDescriptionObserver>(completionHandler)); - _peerConnection->SetRemoteDescription(sdp.nativeDescription->Clone(), observer); + _peerConnection->SetRemoteDescription(sdp.nativeDescription ? sdp.nativeDescription->Clone() : nullptr, observer); } - (BOOL)setBweMinBitrateBps:(nullable NSNumber *)minBitrateBps diff --git a/tools_webrtc/ios/build_ios_libs.py b/tools_webrtc/ios/build_ios_libs.py index a06f829e00..67e2df4972 100755 --- a/tools_webrtc/ios/build_ios_libs.py +++ b/tools_webrtc/ios/build_ios_libs.py @@ -38,7 +38,7 @@ 'arm64', 'x64' ] DEFAULT_ARCHS = [ - 'device:arm64', 'simulator:arm64', 'simulator:x64' + 'device:arm64', 'simulator:arm64', 'simulator:x64', 'device:arm', 'simulator:x86' ] IOS_DEPLOYMENT_TARGET = '9.0' LIBVPX_BUILD_VP9 = True