Changeset 189172 in webkit

Timestamp:

Aug 31, 2015 10:04:14 AM (9 years ago)

Author:

mark.lam@apple.com

Message:

Watchdog timer callback should release the lock before deref'ing the watchdog.
​https://bugs.webkit.org/show_bug.cgi?id=148635

Reviewed by Filip Pizlo.

The deref'ing of the watchdog may free it. The lock may not be available to be unlocked
after the deref.

• runtime/Watchdog.cpp:

(JSC::Watchdog::Watchdog):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Watchdog.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-08-31  Mark Lam  <mark.lam@apple.com>
+
+        Watchdog timer callback should release the lock before deref'ing the watchdog.
+        https://bugs.webkit.org/show_bug.cgi?id=148635
+
+        Reviewed by Filip Pizlo.
+
+        The deref'ing of the watchdog may free it.  The lock may not be available to be unlocked
+        after the deref.
+
+        * runtime/Watchdog.cpp:
+        (JSC::Watchdog::Watchdog):
+
 2015-08-30  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/runtime/Watchdog.cpp

@@ -52 +52 @@
 {
     m_timerHandler = [this] {
-        LockHolder locker(m_lock);
-        this->m_timerDidFire = true;
+        {
+            LockHolder locker(m_lock);
+            this->m_timerDidFire = true;
+        }
         this->deref();
     };