Title: [189172] trunk/Source/_javascript_Core
- Revision
- 189172
- Author
- [email protected]
- Date
- 2015-08-31 10:04:14 -0700 (Mon, 31 Aug 2015)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (189171 => 189172)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-31 16:53:59 UTC (rev 189171)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-31 17:04:14 UTC (rev 189172)
@@ -1,3 +1,16 @@
+2015-08-31 Mark Lam <[email protected]>
+
+ 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 <[email protected]>
[ES6] JSON.stringify should ignore object properties that have symbol values and convert the symbol values in array to null
Modified: trunk/Source/_javascript_Core/runtime/Watchdog.cpp (189171 => 189172)
--- trunk/Source/_javascript_Core/runtime/Watchdog.cpp 2015-08-31 16:53:59 UTC (rev 189171)
+++ trunk/Source/_javascript_Core/runtime/Watchdog.cpp 2015-08-31 17:04:14 UTC (rev 189172)
@@ -51,8 +51,10 @@
, m_timerQueue(WorkQueue::create("jsc.watchdog.queue", WorkQueue::Type::Serial, WorkQueue::QOS::Utility))
{
m_timerHandler = [this] {
- LockHolder locker(m_lock);
- this->m_timerDidFire = true;
+ {
+ LockHolder locker(m_lock);
+ this->m_timerDidFire = true;
+ }
this->deref();
};
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
