[webkit-changes] cvs commit: JavaScriptCore/kjs function.cpp
nodes.cpp
Geoffrey
ggaren at opensource.apple.com
Tue Aug 9 19:45:53 PDT 2005
ggaren 05/08/09 19:45:52
Modified: . Tag: Safari-2-0-branch ChangeLog
bindings Tag: Safari-2-0-branch NP_jsobject.cpp
bindings/jni Tag: Safari-2-0-branch jni_jsobject.cpp
bindings/objc Tag: Safari-2-0-branch WebScriptObject.mm
kjs Tag: Safari-2-0-branch function.cpp nodes.cpp
Log:
Bug #:
Revision Changes Path
No revision
No revision
1.677.6.24 +23 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.677.6.23
retrieving revision 1.677.6.24
diff -u -r1.677.6.23 -r1.677.6.24
--- ChangeLog 9 Aug 2005 18:22:47 -0000 1.677.6.23
+++ ChangeLog 10 Aug 2005 02:45:47 -0000 1.677.6.24
@@ -1,3 +1,26 @@
+2005-08-09 Geoffrey Garen <ggaren at apple.com>
+
+ -fixed <rdar://problem/4197421> crash in ObjectImp::findPropertyHashEntry at ifilm.com
+ [due to JS infinite recursion]
+
+ More changes in WebCore.
+
+ Reviewed by darin.
+
+ All calls to FunctionImp::call now go through ObjectImp::call to preserve
+ stack depth checking.
+
+ * bindings/NP_jsobject.cpp:
+ (_NPN_Invoke):
+ * bindings/jni/jni_jsobject.cpp:
+ (JSObject::call):
+ * bindings/objc/WebScriptObject.mm:
+ (-[WebScriptObject callWebScriptMethod:withArguments:]):
+ * kjs/function.cpp:
+ (KJS::DeclaredFunctionImp::construct):
+ * kjs/nodes.cpp:
+ (FunctionCallNode::evaluate):
+
2005-08-09 Adele Peterson <adele at apple.com>
Merged fix from TOT to Safari-2-0-branch
No revision
No revision
1.18.8.2 +1 -1 JavaScriptCore/bindings/NP_jsobject.cpp
Index: NP_jsobject.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/NP_jsobject.cpp,v
retrieving revision 1.18.8.1
retrieving revision 1.18.8.2
diff -u -r1.18.8.1 -r1.18.8.2
--- NP_jsobject.cpp 24 May 2005 00:52:40 -0000 1.18.8.1
+++ NP_jsobject.cpp 10 Aug 2005 02:45:49 -0000 1.18.8.2
@@ -166,7 +166,7 @@
Object thisObj = Object(const_cast<ObjectImp*>(obj->imp));
List argList = listFromVariantArgs(exec, args, argCount);
Interpreter::lock();
- Value resultV = funcImp->call (exec, thisObj, argList);
+ Value resultV = Object(funcImp).call (exec, thisObj, argList);
Interpreter::unlock();
// Convert and return the result of the function call.
No revision
No revision
1.10.10.2 +1 -1 JavaScriptCore/bindings/jni/jni_jsobject.cpp
Index: jni_jsobject.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_jsobject.cpp,v
retrieving revision 1.10.10.1
retrieving revision 1.10.10.2
diff -u -r1.10.10.1 -r1.10.10.2
--- jni_jsobject.cpp 22 Jul 2005 01:18:15 -0000 1.10.10.1
+++ jni_jsobject.cpp 10 Aug 2005 02:45:50 -0000 1.10.10.2
@@ -185,7 +185,7 @@
Object thisObj = Object(const_cast<ObjectImp*>(_imp));
List argList = listFromJArray(args);
Interpreter::lock();
- Value result = funcImp->call (exec, thisObj, argList);
+ Value result = Object(funcImp).call (exec, thisObj, argList);
Interpreter::unlock();
// Convert and return the result of the function call.
No revision
No revision
1.17.8.2 +1 -1 JavaScriptCore/bindings/objc/WebScriptObject.mm
Index: WebScriptObject.mm
===================================================================
RCS file: /cvs/root/JavaScriptCore/bindings/objc/WebScriptObject.mm,v
retrieving revision 1.17.8.1
retrieving revision 1.17.8.2
diff -u -r1.17.8.1 -r1.17.8.2
--- WebScriptObject.mm 2 Aug 2005 16:39:23 -0000 1.17.8.1
+++ WebScriptObject.mm 10 Aug 2005 02:45:50 -0000 1.17.8.2
@@ -207,7 +207,7 @@
ObjectImp *funcImp = static_cast<ObjectImp*>(func.imp());
Object thisObj = Object(const_cast<ObjectImp*>([self _imp]));
List argList = listFromNSArray(exec, args);
- Value result = funcImp->call (exec, thisObj, argList);
+ Value result = Object(funcImp).call (exec, thisObj, argList);
Interpreter::unlock();
if (exec->hadException()) {
No revision
No revision
1.38.8.4 +1 -1 JavaScriptCore/kjs/function.cpp
Index: function.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/function.cpp,v
retrieving revision 1.38.8.3
retrieving revision 1.38.8.4
diff -u -r1.38.8.3 -r1.38.8.4
--- function.cpp 9 Aug 2005 18:22:48 -0000 1.38.8.3
+++ function.cpp 10 Aug 2005 02:45:51 -0000 1.38.8.4
@@ -294,7 +294,7 @@
Object obj(new ObjectImp(proto));
- Value res = call(exec,obj,args);
+ Value res = Object(this).call(exec,obj,args);
if (res.type() == ObjectType)
return Object::dynamicCast(res);
1.52.12.5 +1 -1 JavaScriptCore/kjs/nodes.cpp
Index: nodes.cpp
===================================================================
RCS file: /cvs/root/JavaScriptCore/kjs/nodes.cpp,v
retrieving revision 1.52.12.4
retrieving revision 1.52.12.5
diff -u -r1.52.12.4 -r1.52.12.5
--- nodes.cpp 9 Aug 2005 18:22:49 -0000 1.52.12.4
+++ nodes.cpp 10 Aug 2005 02:45:51 -0000 1.52.12.5
@@ -721,7 +721,7 @@
}
Object thisObj(thisObjImp);
- return func->call(exec, thisObj, argList);
+ return Object(func).call(exec, thisObj, argList);
}
// ------------------------------ PostfixNode ----------------------------------
More information about the webkit-changes
mailing list