commit ef43aafcf5953845b71840e14c94942d60c541c1
author Yura Yaroshevich <yura.yaroshevich@gmail.com> Mon Jul 09 19:16:32 2018 +0300
committer Commit Bot <commit-bot@chromium.org> Tue Jul 10 07:35:35 2018 +0000
tree ab31f5a2dce3aba8cf40e61178be0738b60aa699
parent bd216f28542de17cb0a402cc24e6da089499f74d

Fixed crash when PCF is destroyed before RTCRtpSender in ObjC

Bug: webrtc:9231
Change-Id: I3b90400bf619938817d7a04a7a1130ba86ad65df
Reviewed-on: https://webrtc-review.googlesource.com/87623
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23896}

sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm

diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm
index e980ade..1df7ae5 100644
--- a/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm
+++ b/sdk/objc/Framework/Classes/PeerConnection/RTCRtpSender.mm
@@ -19,6 +19,7 @@
 #include "api/mediastreaminterface.h"
 
 @implementation RTCRtpSender {
+  RTCPeerConnectionFactory *_factory;
   rtc::scoped_refptr<webrtc::RtpSenderInterface> _nativeRtpSender;
 }
 
@@ -84,10 +85,12 @@
   return _nativeRtpSender;
 }
 
-- (instancetype)initWithNativeRtpSender:
-    (rtc::scoped_refptr<webrtc::RtpSenderInterface>)nativeRtpSender {
+- (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
+                nativeRtpSender:(rtc::scoped_refptr<webrtc::RtpSenderInterface>)nativeRtpSender {
+  NSParameterAssert(factory);
   NSParameterAssert(nativeRtpSender);
   if (self = [super init]) {
+    _factory = factory;
     _nativeRtpSender = nativeRtpSender;
     rtc::scoped_refptr<webrtc::DtmfSenderInterface> nativeDtmfSender(
         _nativeRtpSender->GetDtmfSender());