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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 57274a3f6a96ff105212d6e1c494d93f19772b65
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 6 22:17:41 2002 +0000

    	I noticed some broken lists at mapblast.com and tracked it down to this.
    
            * kjs/array_object.cpp:
            (ArrayInstanceImp::put): Don't truncate the list; only extend the length if
    	it's not already long enough.
            (ArrayProtoFuncImp::call): Fix some ifdef'd code so it compiles if you turn
    	the ifdefs on.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2262 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c8b9b31..3a2f218 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-06  Darin Adler  <darin at apple.com>
+
+	I noticed some broken lists at mapblast.com and tracked it down to this.
+
+        * kjs/array_object.cpp:
+        (ArrayInstanceImp::put): Don't truncate the list; only extend the length if
+	it's not already long enough.
+        (ArrayProtoFuncImp::call): Fix some ifdef'd code so it compiles if you turn
+	the ifdefs on.
+
 2002-10-04  Darin Adler  <darin at apple.com>
 
         Fixed problems parsing numbers that are larger than a long with parseInt.
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index c8b9b31..3a2f218 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-10-06  Darin Adler  <darin at apple.com>
+
+	I noticed some broken lists at mapblast.com and tracked it down to this.
+
+        * kjs/array_object.cpp:
+        (ArrayInstanceImp::put): Don't truncate the list; only extend the length if
+	it's not already long enough.
+        (ArrayProtoFuncImp::call): Fix some ifdef'd code so it compiles if you turn
+	the ifdefs on.
+
 2002-10-04  Darin Adler  <darin at apple.com>
 
         Fixed problems parsing numbers that are larger than a long with parseInt.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index c8b9b31..3a2f218 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-10-06  Darin Adler  <darin at apple.com>
+
+	I noticed some broken lists at mapblast.com and tracked it down to this.
+
+        * kjs/array_object.cpp:
+        (ArrayInstanceImp::put): Don't truncate the list; only extend the length if
+	it's not already long enough.
+        (ArrayProtoFuncImp::call): Fix some ifdef'd code so it compiles if you turn
+	the ifdefs on.
+
 2002-10-04  Darin Adler  <darin at apple.com>
 
         Fixed problems parsing numbers that are larger than a long with parseInt.
diff --git a/JavaScriptCore/kjs/array_object.cpp b/JavaScriptCore/kjs/array_object.cpp
index 0ac4af4..5adbe28 100644
--- a/JavaScriptCore/kjs/array_object.cpp
+++ b/JavaScriptCore/kjs/array_object.cpp
@@ -101,7 +101,8 @@ void ArrayInstanceImp::put(ExecState *exec, const UString &propertyName, const V
   bool ok;
   unsigned index = propertyName.toULong(&ok);
   if (ok) {
-    setLength(index + 1);
+    if (length <= index)
+      setLength(index + 1);
     storage[index] = value.imp();
     return;
   }
@@ -111,7 +112,8 @@ void ArrayInstanceImp::put(ExecState *exec, const UString &propertyName, const V
 
 void ArrayInstanceImp::put(ExecState *exec, unsigned index, const Value &value, int attr)
 {
-  setLength(index + 1);
+  if (length <= index)
+    setLength(index + 1);
   storage[index] = value.imp();
 }
 
@@ -411,7 +413,7 @@ Value ArrayProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &args
 #if 0
     printf("KJS Array::Sort length=%d\n", length);
     for ( unsigned int i = 0 ; i<length ; ++i )
-      printf("KJS Array::Sort: %d: %s\n", i, thisObj.get(i).toString().value().ascii() );
+      printf("KJS Array::Sort: %d: %s\n", i, thisObj.get(exec, i).toString(exec).ascii() );
 #endif
     Object sortFunction;
     bool useSortFunction = (args[0].type() != UndefinedType);
@@ -469,7 +471,7 @@ Value ArrayProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &args
 #if 0
     printf("KJS Array::Sort -- Resulting array:\n");
     for ( unsigned int i = 0 ; i<length ; ++i )
-      printf("KJS Array::Sort: %d: %s\n", i, thisObj.get(i).toString().value().ascii() );
+      printf("KJS Array::Sort: %d: %s\n", i, thisObj.get(exec, i).toString(exec).ascii() );
 #endif
     result = thisObj;
     break;

-- 
WebKit Debian packaging