From d5ebd5a60fd3e31e175197cef6e1ea16c364435d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 24 Jul 2018 19:35:56 -0600 Subject: [PATCH 1/2] UBSan fixup --- Signal/src/views/RemoteVideoView.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Signal/src/views/RemoteVideoView.m b/Signal/src/views/RemoteVideoView.m index aa7f885ce0..a52f935f17 100644 --- a/Signal/src/views/RemoteVideoView.m +++ b/Signal/src/views/RemoteVideoView.m @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) __kindof UIView *videoRenderer; // Used for legacy EAGLVideoView -@property (nullable, nonatomic) NSMutableArray *remoteVideoConstraints; +@property (nullable, nonatomic) NSArray *remoteVideoConstraints; @end @@ -32,6 +32,8 @@ NS_ASSUME_NONNULL_BEGIN return self; } + _remoteVideoConstraints = @[]; + // Currently RTC only supports metal on 64bit machines #if defined(RTC_SUPPORTS_METAL) // On 64-bit, iOS9+: uses the MetalKit backed view for improved battery/rendering performance. @@ -142,7 +144,7 @@ NS_ASSUME_NONNULL_BEGIN [constraints addObjectsFromArray:[videoView autoPinEdgesToSuperviewEdges]]; } - self.remoteVideoConstraints = constraints; + self.remoteVideoConstraints = [constraints copy]; // We need to force relayout to occur immediately (and not // wait for a UIKit layout/render pass) or the remoteVideoView // (which presumably is updating its CALayer directly) will From 19ece45c8d92678bdb6ede201c8d0c5314e5c0cb Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 25 Jul 2018 12:23:16 -0600 Subject: [PATCH 2/2] Update WebRTC to M68 --- Carthage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carthage b/Carthage index b316e4e263..d69c75bfcf 160000 --- a/Carthage +++ b/Carthage @@ -1 +1 @@ -Subproject commit b316e4e26362bb86605cd3743d513ea8a57e66bf +Subproject commit d69c75bfcf8a7387c86f30c563f788c59b94a66f