Fixing possible crash due to RefCountedChannel assignment operator.

webrtc/p2p/base/transportcontroller.h

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_
 #define WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/asyncinvoker.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/refcountedobject.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/jseptransport.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
 
 namespace rtc {
 class Thread;
 class PacketTransportInterface;
@@ skipping 126 matching lines @@
       const std::string& transport_name,
       int component);
   virtual TransportChannelImpl* CreateDtlsTransportChannel_n(
       const std::string& transport_name,
       int component,
       TransportChannelImpl* ice);
 
  private:
   void OnMessage(rtc::Message* pmsg) override;
 
-  // This structure groups the DTLS and ICE channels, and helps keep track of
-  // how many external objects (BaseChannels) reference each channel.
-  struct RefCountedChannel {
-    RefCountedChannel() = default;
-    // TODO(deadbeef): Change the types of |dtls| and |ice| to
-    // DtlsTransportChannelWrapper and P2PTransportChannelWrapper,
-    // once TransportChannelImpl is removed.
-    explicit RefCountedChannel(TransportChannelImpl* dtls,
-                               TransportChannelImpl* ice)
-        : ice_(ice), dtls_(dtls), ref_(0) {}
-
-    void AddRef() { ++ref_; }
-    void DecRef() {
-      ASSERT(ref_ > 0);
-      --ref_;
-    }
-    int ref() const { return ref_; }
-
-    // Currently, all ICE-related calls still go through this DTLS channel. But
-    // that will change once we get rid of TransportChannelImpl, and the DTLS
-    // channel interface no longer includes ICE-specific methods.
-    const TransportChannelImpl* dtls() const { return dtls_.get(); }
-    TransportChannelImpl* dtls() { return dtls_.get(); }
-    const TransportChannelImpl* ice() const { return ice_.get(); }
-    TransportChannelImpl* ice() { return ice_.get(); }
-
-   private:
-    std::unique_ptr<TransportChannelImpl> ice_;
-    std::unique_ptr<TransportChannelImpl> dtls_;
-    int ref_ = 0;
-  };
+  class ChannelPair;
+  typedef rtc::RefCountedObject<ChannelPair> RefCountedChannel;
 
   // Helper functions to get a channel or transport, or iterator to it (in case
   // it needs to be erased).
-  std::vector<RefCountedChannel>::iterator GetChannelIterator_n(
+  std::vector<RefCountedChannel*>::iterator GetChannelIterator_n(
       const std::string& transport_name,
       int component);
-  std::vector<RefCountedChannel>::const_iterator GetChannelIterator_n(
+  std::vector<RefCountedChannel*>::const_iterator GetChannelIterator_n(
       const std::string& transport_name,
       int component) const;
   const JsepTransport* GetJsepTransport_n(
       const std::string& transport_name) const;
   JsepTransport* GetJsepTransport_n(const std::string& transport_name);
   const RefCountedChannel* GetChannel_n(const std::string& transport_name,
                                         int component) const;
   RefCountedChannel* GetChannel_n(const std::string& transport_name,
                                   int component);
 
@@ skipping 43 matching lines @@
 
   void UpdateAggregateStates_n();
 
   void OnDtlsHandshakeError(rtc::SSLHandshakeError error);
 
   rtc::Thread* const signaling_thread_ = nullptr;
   rtc::Thread* const network_thread_ = nullptr;
   PortAllocator* const port_allocator_ = nullptr;
 
   std::map<std::string, std::unique_ptr<JsepTransport>> transports_;
-  std::vector<RefCountedChannel> channels_;
+  std::vector<RefCountedChannel*> channels_;
 
   // Aggregate state for TransportChannelImpls.
   IceConnectionState connection_state_ = kIceConnectionConnecting;
   bool receiving_ = false;
   IceGatheringState gathering_state_ = kIceGatheringNew;
 
   IceConfig ice_config_;
   IceRole ice_role_ = ICEROLE_CONTROLLING;
   bool redetermine_role_on_ice_restart_;
   uint64_t ice_tiebreaker_ = rtc::CreateRandomId64();
   rtc::SSLProtocolVersion ssl_max_version_ = rtc::SSL_PROTOCOL_DTLS_12;
   rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
   rtc::AsyncInvoker invoker_;
   // True if QUIC is used instead of DTLS.
   bool quic_ = false;
 
   webrtc::MetricsObserverInterface* metrics_observer_ = nullptr;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(TransportController);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_