diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-04-30 14:28:18 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-30 15:04:23 +0200 |
| commit | 498d0427290f5a9957bfab1bb521eb10b9b9693a (patch) | |
| tree | ea9055322dcdd42b22e4b66d5cfad80a88df27a4 | |
| parent | cd42b1505bdfcadd9135c7244342a13cbf34d5e7 (diff) | |
| download | qtwebkit-498d0427290f5a9957bfab1bb521eb10b9b9693a.tar.gz | |
Assert in JSC::Heap::unprotect when closing facebook.com web site
https://bugs.webkit.org/show_bug.cgi?id=115058
Reviewed by Darin Adler.
Grab a JSLock before calling RootObject::invalidate().
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::~ScriptController):
Change-Id: I7bd89efc0ed069f4843d407716d821f132d424ba
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@149188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/WebCore/bindings/js/ScriptController.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/bindings/js/ScriptController.cpp b/Source/WebCore/bindings/js/ScriptController.cpp index a605e638f..370ddf627 100644 --- a/Source/WebCore/bindings/js/ScriptController.cpp +++ b/Source/WebCore/bindings/js/ScriptController.cpp @@ -82,6 +82,7 @@ ScriptController::~ScriptController() disconnectPlatformScriptObjects(); if (m_cacheableBindingRootObject) { + JSLockHolder lock(JSDOMWindowBase::commonJSGlobalData()); m_cacheableBindingRootObject->invalidate(); m_cacheableBindingRootObject = 0; } |