Changeset 19234 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 29, 2007, 1:58:31 PM (18 years ago)

Author:

kmccullo

Message:

JavaScriptCore:

Reviewed by Geoff and Oliver.

• rdar://problem/4955561
• missusing JavaScript shouldn't crash webkit. Now it doesn't, in this case.

• bindings/objc/objc_runtime.mm: (ObjcFallbackObjectImp::callAsFunction):
• bindings/runtime_method.cpp: (RuntimeMethod::callAsFunction):
• bindings/runtime_object.cpp: (RuntimeObjectImp::callAsFunction):

LayoutTests:

Reviewed by Geoff and Oliver.

• rdar://problem/4955561
• missusing JavaScript shouldn't crash webkit. Now it doesn't in this case.

• plugins/call-as-function-test-expected.txt: Added.
• plugins/call-as-function-test.html: Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/objc/objc_runtime.mm (modified) (1 diff)
• bindings/runtime_method.cpp (modified) (1 diff)
• bindings/runtime_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-01-29  Kevin McCullough  <[email protected]>
+
+        Reviewed by Geoff and Oliver.
+
+        - rdar://problem/4955561
+        - missusing JavaScript shouldn't crash webkit.  Now it doesn't, in this case.
+
+        * bindings/objc/objc_runtime.mm:
+        (ObjcFallbackObjectImp::callAsFunction):
+        * bindings/runtime_method.cpp:
+        (RuntimeMethod::callAsFunction):
+        * bindings/runtime_object.cpp:
+        (RuntimeObjectImp::callAsFunction):
+
 2007-01-28  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/bindings/objc/objc_runtime.mm

@@ -277 +277 @@
 JSValue* ObjcFallbackObjectImp::callAsFunction(ExecState* exec, JSObject* thisObj, const List &args)
 {
+    if (thisObj->classInfo() != &KJS::RuntimeObjectImp::info)
+        return throwError(exec, TypeError);
+
     JSValue* result = jsUndefined();
-    
+
     RuntimeObjectImp* imp = static_cast<RuntimeObjectImp*>(thisObj);
-    if (imp) {
-        Instance* instance = imp->getInternalInstance();
-        
-        instance->begin();
-
-        ObjcInstance* objcInstance = static_cast<ObjcInstance*>(instance);
-        id targetObject = objcInstance->getObject();
-        
-        if ([targetObject respondsToSelector:@selector(invokeUndefinedMethodFromWebScript:withArguments:)]){
-            MethodList methodList;
-            ObjcClass* objcClass = static_cast<ObjcClass*>(instance->getClass());
-            ObjcMethod* fallbackMethod = new ObjcMethod (objcClass->isa(), sel_getName(@selector(invokeUndefinedMethodFromWebScript:withArguments:)));
-            fallbackMethod->setJavaScriptName((CFStringRef)[NSString stringWithCString:_item.ascii() encoding:NSASCIIStringEncoding]);
-            methodList.addMethod ((Method*)fallbackMethod);
-            result = instance->invokeMethod(exec, methodList, args);
-            delete fallbackMethod;
-        }
-                
-        instance->end();
-    }
+    Instance* instance = imp->getInternalInstance();
+
+    instance->begin();
+
+    ObjcInstance* objcInstance = static_cast<ObjcInstance*>(instance);
+    id targetObject = objcInstance->getObject();
+    
+    if ([targetObject respondsToSelector:@selector(invokeUndefinedMethodFromWebScript:withArguments:)]){
+        MethodList methodList;
+        ObjcClass* objcClass = static_cast<ObjcClass*>(instance->getClass());
+        ObjcMethod* fallbackMethod = new ObjcMethod (objcClass->isa(), sel_getName(@selector(invokeUndefinedMethodFromWebScript:withArguments:)));
+        fallbackMethod->setJavaScriptName((CFStringRef)[NSString stringWithCString:_item.ascii() encoding:NSASCIIStringEncoding]);
+        methodList.addMethod ((Method*)fallbackMethod);
+        result = instance->invokeMethod(exec, methodList, args);
+        delete fallbackMethod;
+    }
+            
+    instance->end();
 
     return result;

trunk/JavaScriptCore/bindings/runtime_method.cpp

@@ -70 +70 @@
 {
     if (_methodList.length() > 0) {
-        RuntimeObjectImp *imp;
-        
-        // If thisObj is the DOM object for a plugin, get the corresponding
-        // runtime object from the DOM object.
-        if (thisObj->classInfo() != &KJS::RuntimeObjectImp::info) {
-            JSValue *runtimeObject = thisObj->get(exec, "__apple_runtime_object");
-            imp = static_cast<RuntimeObjectImp*>(runtimeObject);
+        RuntimeObjectImp *imp = 0;
+
+        if (thisObj->classInfo() == &KJS::RuntimeObjectImp::info) {
+            imp = static_cast<RuntimeObjectImp*>(thisObj);
+        } else {
+            // If thisObj is the DOM object for a plugin, get the corresponding
+            // runtime object from the DOM object.
+            JSValue* value = thisObj->get(exec, "__apple_runtime_object");
+            if (value->isObject(&KJS::RuntimeObjectImp::info))    
+                imp = static_cast<RuntimeObjectImp*>(value);
         }
-        else {
-            imp = static_cast<RuntimeObjectImp*>(thisObj);
-        }
-        if (imp) {
-            Instance *instance = imp->getInternalInstance();
-            
-            instance->begin();
-            
-            JSValue *aValue = instance->invokeMethod(exec, _methodList, args);
-            
-            instance->end();
-            
-            return aValue;
-        }
+
+        if (!imp)
+            return throwError(exec, TypeError);
+
+        Instance *instance = imp->getInternalInstance();
+        instance->begin();
+        JSValue *aValue = instance->invokeMethod(exec, _methodList, args);
+        instance->end();
+        return aValue;
     }
-    
+
     return jsUndefined();
 }

trunk/JavaScriptCore/bindings/runtime_object.cpp

@@ -188 +188 @@
     instance->begin();
 
-    JSValue *aValue = getInternalInstance()->invokeDefaultMethod(exec, args);
+    JSValue *aValue = instance->invokeDefaultMethod(exec, args);
     
     instance->end();