From f11c8d1e2c52acd50f86ba03570e093e618e453e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1ri=20Tristan=20Helgason?= Date: Tue, 14 May 2019 08:46:57 +0200 Subject: [PATCH] Check for uninitialized audio unit in HandleInterruptionEnd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a potential crash if interrupted before the audio unit has been initialized. Bug: None Change-Id: Ib9f5ea305c98a172f8df52af5767c8543e59701c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/136800 Reviewed-by: Henrik Andreassson Reviewed-by: Kári Helgason Commit-Queue: Kári Helgason Cr-Commit-Position: refs/heads/master@{#27937} --- sdk/objc/native/src/audio/audio_device_ios.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/objc/native/src/audio/audio_device_ios.mm b/sdk/objc/native/src/audio/audio_device_ios.mm index e8b3725ec4..6bf1d9b8ea 100644 --- a/sdk/objc/native/src/audio/audio_device_ios.mm +++ b/sdk/objc/native/src/audio/audio_device_ios.mm @@ -518,6 +518,7 @@ void AudioDeviceIOS::HandleInterruptionEnd() { "Updating audio unit state.", is_interrupted_); is_interrupted_ = false; + if (!audio_unit_) return; if (webrtc::field_trial::IsEnabled("WebRTC-Audio-iOS-Holding")) { // Work around an issue where audio does not restart properly after an interruption // by restarting the audio unit when the interruption ends.