[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit f4d5b25b159e7d951290029551b0da0a6236364e
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 21 08:49:58 2003 +0000

            Patch from Harri Porten, reviewed by me.
    
    	- fixed 3491709 - using Function.apply with a primitive type as the arg list causes crash
    
    	* kjs/function_object.cpp:
            (FunctionProtoFuncImp::call): Nest parentheses properly.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5618 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9767da5..51cc9ea 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-21  Maciej Stachowiak  <mjs at apple.com>
+
+        Patch from Harri Porten, reviewed by me.
+
+	- fixed 3491709 - using Function.apply with a primitive type as the arg list causes crash
+        
+	* kjs/function_object.cpp:
+        (FunctionProtoFuncImp::call): Nest parentheses properly.
+
 2003-11-20  Richard Williamson   <rjw at apple.com>
 
 	More LiveConnect stuff.  Primitive Java fields are now
diff --git a/JavaScriptCore/kjs/function_object.cpp b/JavaScriptCore/kjs/function_object.cpp
index a981ee9..e84993f 100644
--- a/JavaScriptCore/kjs/function_object.cpp
+++ b/JavaScriptCore/kjs/function_object.cpp
@@ -127,9 +127,9 @@ Value FunctionProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &a
 
     List applyArgs;
     if (!argArray.isA(NullType) && !argArray.isA(UndefinedType)) {
-      if ((argArray.isA(ObjectType) &&
-           Object::dynamicCast(argArray).inherits(&ArrayInstanceImp::info)) ||
-           Object::dynamicCast(argArray).inherits(&ArgumentsImp::info)) {
+      if (argArray.isA(ObjectType) &&
+           (Object::dynamicCast(argArray).inherits(&ArrayInstanceImp::info) ||
+            Object::dynamicCast(argArray).inherits(&ArgumentsImp::info))) {
 
         Object argArrayObj = Object::dynamicCast(argArray);
         unsigned int length = argArrayObj.get(exec,lengthPropertyName).toUInt32(exec);

-- 
WebKit Debian packaging