Changeset 24106 in webkit

Timestamp:

Jul 9, 2007, 12:39:21 AM (18 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Oliver.

• JavaScriptCore part of fix for: <rdar://problem/5295734> Repro crash closing tab/window @ maps.google.com in WTF::HashSet<KJS::RuntimeObjectImp*, WTF::PtrHash<KJS::RuntimeObjectImp*>, WTF::HashTraits<KJS::RuntimeObjectImp*> >::add + 11

• JavaScriptCore.exp: Added needed export.

WebCore:

Reviewed by Oliver.

<rdar://problem/5295734> Repro crash closing tab/window @ maps.google.com in WTF::HashSet<KJS::RuntimeObjectImp*, WTF::PtrHash<KJS::RuntimeObjectImp*>, WTF::HashTraits<KJS::RuntimeObjectImp*> >::add + 11

Automated test case is not possible. Did not bother with manual test this time.

• bindings/js/kjs_dom.cpp: (WebCore::getRuntimeObject): Check that runtime root isn't null, as well as instance; this should cover the case where the plugin is already shut down and onunload time.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.exp (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/kjs_dom.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-07-09  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Oliver.
+        
+        - JavaScriptCore part of fix for: <rdar://problem/5295734> Repro crash closing tab/window @ maps.google.com in WTF::HashSet<KJS::RuntimeObjectImp*, WTF::PtrHash<KJS::RuntimeObjectImp*>, WTF::HashTraits<KJS::RuntimeObjectImp*> >::add + 11
+        
+        * JavaScriptCore.exp: Added needed export.
+
 2007-07-06  Maciej Stachowiak  <mjs@apple.com>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -186 +186 @@
 __ZN3KJS8Bindings23convertObjcValueToValueEPNS_9ExecStateEPvNS0_13ObjcValueTypeEPNS0_10RootObjectE
 __ZN3KJS8Bindings23convertValueToObjcValueEPNS_9ExecStateEPNS_7JSValueENS0_13ObjcValueTypeE
+__ZNK3KJS8Bindings8Instance10rootObjectEv
 __ZN3KJS8Bindings8Instance18didExecuteFunctionEv
 __ZN3KJS8Bindings8Instance21setDidExecuteFunctionEPFvPNS_9ExecStateEPNS_8JSObjectEE

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-09  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Oliver.
+
+        <rdar://problem/5295734> Repro crash closing tab/window @ maps.google.com in WTF::HashSet<KJS::RuntimeObjectImp*, WTF::PtrHash<KJS::RuntimeObjectImp*>, WTF::HashTraits<KJS::RuntimeObjectImp*> >::add + 11
+        
+        Automated test case is not possible. Did not bother with manual test this time.
+
+        * bindings/js/kjs_dom.cpp:
+        (WebCore::getRuntimeObject): Check that runtime root isn't null, as well as instance;
+        this should cover the case where the plugin is already shut down and onunload time.
+
 2007-07-08  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/bindings/js/kjs_dom.cpp

@@ -104 +104 @@
     if (n->hasTagName(objectTag) || n->hasTagName(embedTag) || n->hasTagName(appletTag)) {
         HTMLPlugInElement* plugInElement = static_cast<HTMLPlugInElement*>(n);
-        if (plugInElement->getInstance())
+        if (plugInElement->getInstance() && plugInElement->getInstance()->rootObject())
             // The instance is owned by the PlugIn element.
             return new RuntimeObjectImp(plugInElement->getInstance());