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

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:54:23 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit fc9e618c49373ca99f9837b7c3e24535684bdfa5
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 25 10:09:20 2002 +0000

    	- fixed 3065638 - "undefined" output to screen on empty document.write()
    
            * khtml/ecma/kjs_html.cpp:
            (KJS::HTMLDocFunction::tryCall): Don;t assume there is at least
    	one argument.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2465 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f99ccdc..68bdaee 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-10-25  Maciej Stachowiak  <mjs at apple.com>
 
+	- fixed 3065638 - "undefined" output to screen on empty document.write()
+	
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLDocFunction::tryCall): Don;t assume there is at least
+	one argument.
+
+2002-10-25  Maciej Stachowiak  <mjs at apple.com>
+
 	- fixed 3048031 - innerHTML is incorrectly null
 	
         * kwq/KWQString.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f99ccdc..68bdaee 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-10-25  Maciej Stachowiak  <mjs at apple.com>
 
+	- fixed 3065638 - "undefined" output to screen on empty document.write()
+	
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLDocFunction::tryCall): Don;t assume there is at least
+	one argument.
+
+2002-10-25  Maciej Stachowiak  <mjs at apple.com>
+
 	- fixed 3048031 - innerHTML is incorrectly null
 	
         * kwq/KWQString.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f99ccdc..68bdaee 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-10-25  Maciej Stachowiak  <mjs at apple.com>
 
+	- fixed 3065638 - "undefined" output to screen on empty document.write()
+	
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLDocFunction::tryCall): Don;t assume there is at least
+	one argument.
+
+2002-10-25  Maciej Stachowiak  <mjs at apple.com>
+
 	- fixed 3048031 - innerHTML is incorrectly null
 	
         * kwq/KWQString.mm:
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index 4100b4f..4652f38 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -75,8 +75,9 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
   case HTMLDocument::Write:
   case HTMLDocument::WriteLn: {
     // DOM only specifies single string argument, but NS & IE allow multiple
-    UString str = v.toString(exec);
-    for (int i = 1; i < args.size(); i++)
+    // or no arguments
+    UString str = "";
+    for (int i = 0; i < args.size(); i++)
       str += args[i].toString(exec);
     if (id == HTMLDocument::WriteLn)
       str += "\n";

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list