Changeset 279296 in webkit

Timestamp:

Jun 25, 2021, 12:51:34 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Fix null crash in AudioMediaStreamTrackRendererCocoa::start
​https://bugs.webkit.org/show_bug.cgi?id=227386
<rdar://79045120>

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-06-25
Reviewed by Youenn Fablet.

AudioMediaStreamTrackRendererInternalUnitManager::Proxy::~Proxy calls those callbacks with nullptr.
So can LocalAudioMediaStreamTrackRendererInternalUnit::retrieveFormatDescription when createAudioUnitIfNeeded
has an early return or hasn't been called yet.

When this happens, let's not crash.

• platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:

(WebCore::AudioMediaStreamTrackRendererCocoa::start):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-25  Alex Christensen  <achristensen@webkit.org>
+
+        Fix null crash in AudioMediaStreamTrackRendererCocoa::start
+        https://bugs.webkit.org/show_bug.cgi?id=227386
+        <rdar://79045120>
+
+        Reviewed by Youenn Fablet.
+
+        AudioMediaStreamTrackRendererInternalUnitManager::Proxy::~Proxy calls those callbacks with nullptr.
+        So can LocalAudioMediaStreamTrackRendererInternalUnit::retrieveFormatDescription when createAudioUnitIfNeeded
+        has an early return or hasn't been called yet.
+
+        When this happens, let's not crash.
+
+        * platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp:
+        (WebCore::AudioMediaStreamTrackRendererCocoa::start):
+
 2021-06-25  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/platform/mediastream/cocoa/AudioMediaStreamTrackRendererCocoa.cpp

@@ -46 +46 @@
 
     AudioMediaStreamTrackRendererUnit::singleton().retrieveFormatDescription([weakThis = makeWeakPtr(this), callback = WTFMove(callback)](auto* formatDescription) mutable {
-        if (weakThis)
+        if (weakThis && formatDescription)
             weakThis->m_outputDescription = makeUnique<CAAudioStreamDescription>(*formatDescription);
         callback();