[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 2dcd6f3c596a42d2a5149eadece880fe5f6f51c5
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 14 05:05:24 2003 +0000

            Reviewed by John.
    
    	- fixed - 3479285 - hang at www.saccourt.com
    	- fixed - 3477088 - (85-112) Safari frozen loading a page at Postal Service site of Taiwan
    
            * khtml/ecma/kjs_html.cpp:
            (KJS::HTMLSelectCollection::tryPut): Use the range-checking
    	version of the number-conversion function to avoid negative
    	numbers and NaN.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5489 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 10cbe76..d37fe62 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-11-13  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed - 3479285 - hang at www.saccourt.com
+	- fixed - 3477088 - (85-112) Safari frozen loading a page at Postal Service site of Taiwan
+	
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLSelectCollection::tryPut): Use the range-checking
+	version of the number-conversion function to avoid negative
+	numbers and NaN.
+
 2003-11-13  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index bc30238..126ab2d 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -3052,7 +3052,13 @@ void KJS::HTMLSelectCollection::tryPut(ExecState *exec, const Identifier &proper
   }
   // resize ?
   else if (propertyName == lengthPropertyName) {
-    long newLen = value.toInteger(exec);
+    unsigned newLen;
+    bool converted = value.toUInt32(newLen);
+
+    if (!converted) {
+      return;
+    }
+
     long diff = element.length() - newLen;
 
     if (diff < 0) { // add dummy elements

-- 
WebKit Debian packaging