commit c75b35ab401bc092c2ad73434f63322bb910bb2f
author Yura Yaroshevich <yura.yaroshevich@gmail.com> Wed Jun 27 17:09:14 2018 +0300
committer Commit Bot <commit-bot@chromium.org> Thu Jun 28 12:54:22 2018 +0000
tree 5d67e99eb36eeeb27ef0534a81db559286772b67
parent 33b61ee81ec0acb7d3e3fa262bdf50fce9302809

Fixed crash when PCF is destroyed before DataChannel in ObjC

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

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

diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel.mm
index 706e43e..06ca453 100644
--- a/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel.mm
+++ b/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel.mm
@@ -85,6 +85,7 @@
 
 
 @implementation RTCDataChannel {
+  RTCPeerConnectionFactory *_factory;
   rtc::scoped_refptr<webrtc::DataChannelInterface> _nativeDataChannel;
   std::unique_ptr<webrtc::DataChannelDelegateAdapter> _observer;
   BOOL _isObserverRegistered;
@@ -165,10 +166,12 @@
 
 #pragma mark - Private
 
-- (instancetype)initWithNativeDataChannel:
-    (rtc::scoped_refptr<webrtc::DataChannelInterface>)nativeDataChannel {
+- (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
+              nativeDataChannel:
+                  (rtc::scoped_refptr<webrtc::DataChannelInterface>)nativeDataChannel {
   NSParameterAssert(nativeDataChannel);
   if (self = [super init]) {
+    _factory = factory;
     _nativeDataChannel = nativeDataChannel;
     _observer.reset(new webrtc::DataChannelDelegateAdapter(self));
     _nativeDataChannel->RegisterObserver(_observer.get());