[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
oliver at apple.com
oliver at apple.com
Thu Apr 8 01:59:33 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit bc0c218732d2c2e11aea0fb6ce2b5aa80b938f5f
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 25 22:52:09 2010 +0000
2010-02-25 Oliver Hunt <oliver at apple.com>
Reviewed by Geoff Garen.
JSC crashes like crazy in the JSPropertyNameIterator destructor
Add back null check of m_cachedStructure. Curse last minute changes.
* runtime/JSPropertyNameIterator.cpp:
(JSC::JSPropertyNameIterator::~JSPropertyNameIterator):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f855d5e..9883103 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,16 @@
2010-02-25 Oliver Hunt <oliver at apple.com>
+ Reviewed by Geoff Garen.
+
+ JSC crashes like crazy in the JSPropertyNameIterator destructor
+
+ Add back null check of m_cachedStructure. Curse last minute changes.
+
+ * runtime/JSPropertyNameIterator.cpp:
+ (JSC::JSPropertyNameIterator::~JSPropertyNameIterator):
+
+2010-02-25 Oliver Hunt <oliver at apple.com>
+
Reviewed by Maciej Stachowiak.
Race condition in JSPropertyNameIterator and Structure destruction
diff --git a/JavaScriptCore/runtime/JSPropertyNameIterator.cpp b/JavaScriptCore/runtime/JSPropertyNameIterator.cpp
index 2e85a9b..a5d4da0 100644
--- a/JavaScriptCore/runtime/JSPropertyNameIterator.cpp
+++ b/JavaScriptCore/runtime/JSPropertyNameIterator.cpp
@@ -49,7 +49,8 @@ inline JSPropertyNameIterator::JSPropertyNameIterator(ExecState* exec, PropertyN
JSPropertyNameIterator::~JSPropertyNameIterator()
{
- m_cachedStructure->clearEnumerationCache(this);
+ if (m_cachedStructure)
+ m_cachedStructure->clearEnumerationCache(this);
}
JSPropertyNameIterator* JSPropertyNameIterator::create(ExecState* exec, JSObject* o)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list