mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
33728152ca
There are two problems with setLocalDescription / setRemoteDescription in ObjC SDK. First, RTCSessionDescription.nativeDescription returns a raw nullableSessionDescriptionInterface pointer, where sLD/sRD are calling Clone() method unconditionally, so it might crash. Second, unnecessary sLD/sRD calls Clone() of the raw pointer and does not delete it, so this pointer will leak. To solve these problems, I changed the return type of nativeDescription to std::unique_ptr and removed the call to Clone() method. Bug: webrtc:13022, webrtc:13035 Change-Id: Icbb87dda62d3a11af47ec74621cf64b8a6c05228 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227380 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Byoungchan Lee <daniel.l@hpcnt.com> Cr-Commit-Position: refs/heads/master@{#34647}
42 lines
1.2 KiB
Objective-C
42 lines
1.2 KiB
Objective-C
/*
|
|
* 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.
|
|
*/
|
|
|
|
#import "RTCSessionDescription.h"
|
|
|
|
#include "api/jsep.h"
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
@interface RTC_OBJC_TYPE (RTCSessionDescription)
|
|
()
|
|
|
|
/**
|
|
* The native SessionDescriptionInterface representation of this
|
|
* RTCSessionDescription object. This is needed to pass to the underlying C++
|
|
* APIs.
|
|
*/
|
|
@property(nonatomic,
|
|
readonly) std::unique_ptr<webrtc::SessionDescriptionInterface> nativeDescription;
|
|
|
|
/**
|
|
* Initialize an RTCSessionDescription from a native
|
|
* SessionDescriptionInterface. No ownership is taken of the native session
|
|
* description.
|
|
*/
|
|
- (instancetype)initWithNativeDescription:
|
|
(const webrtc::SessionDescriptionInterface *)nativeDescription;
|
|
|
|
+ (std::string)stdStringForType:(RTCSdpType)type;
|
|
|
|
+ (RTCSdpType)typeForStdString:(const std::string &)string;
|
|
|
|
@end
|
|
|
|
NS_ASSUME_NONNULL_END
|