Changeset 171149 in webkit

Timestamp:

Jul 16, 2014 12:10:22 PM (10 years ago)

Author:

jer.noble@apple.com

Message:

REGRESSION(r171069) 75% repro crash in WebCore::AudioHardwareListenerMac::processIsRunningChanged()
​https://bugs.webkit.org/show_bug.cgi?id=134986

Reviewed by Eric Carlson.

Add a WeakPtrFactory to AudioHardwareListenerMac, so that if CoreAudio calls our block after
being unregistered, we can bail early instead of calling into a deleted object.

• platform/audio/mac/AudioHardwareListenerMac.cpp:

(WebCore::AudioHardwareListenerMac::AudioHardwareListenerMac):

• platform/audio/mac/AudioHardwareListenerMac.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/mac/AudioHardwareListenerMac.cpp (modified) (1 diff)
• platform/audio/mac/AudioHardwareListenerMac.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-16  Jer Noble  <jer.noble@apple.com>
+
+        REGRESSION(r171069) 75% repro crash in WebCore::AudioHardwareListenerMac::processIsRunningChanged()
+        https://bugs.webkit.org/show_bug.cgi?id=134986
+
+        Reviewed by Eric Carlson.
+
+        Add a WeakPtrFactory to AudioHardwareListenerMac, so that if CoreAudio calls our block after
+        being unregistered, we can bail early instead of calling into a deleted object.
+
+        * platform/audio/mac/AudioHardwareListenerMac.cpp:
+        (WebCore::AudioHardwareListenerMac::AudioHardwareListenerMac):
+        * platform/audio/mac/AudioHardwareListenerMac.h:
+
 2014-07-16  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/audio/mac/AudioHardwareListenerMac.cpp

@@ -122 +122 @@
 AudioHardwareListenerMac::AudioHardwareListenerMac(Client& client)
     : AudioHardwareListener(client)
+    , m_weakFactory(this)
 {
     setHardwareActivity(isAudioHardwareProcessRunning());
     setOutputDeviceSupportsLowPowerMode(currentDeviceSupportsLowPowerBufferSize());
 
+    auto weakThis = m_weakFactory.createWeakPtr();
     m_block = Block_copy(^(UInt32 count, const AudioObjectPropertyAddress properties[]) {
-        propertyChanged(count, properties);
+        if (weakThis)
+            weakThis->propertyChanged(count, properties);
     });
 

trunk/Source/WebCore/platform/audio/mac/AudioHardwareListenerMac.h

@@ -28 +28 @@
 
 #include "AudioHardwareListener.h"
+#include <wtf/WeakPtr.h>
 
 #if PLATFORM(MAC)
@@ -49 +50 @@
 
     AudioObjectPropertyListenerBlock m_block;
+    WeakPtrFactory<AudioHardwareListenerMac> m_weakFactory;
 };