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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 5f65a093b2e6cd1100e353b5eb4e75ec6b12da2e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 4 01:52:19 2003 +0000

            Fix for 3138425. Don't open a new window when document.open() is called
            with < 2 parameters.
    
            Reviewed by darin.
    
            * khtml/ecma/kjs_html.cpp:
            (KJS::HTMLDocFunction::tryCall):
            * khtml/ecma/kjs_window.cpp:
            (WindowFunc::tryCall):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3251 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 64f58d1..64d67b6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2003-01-03  Richard Williamson   <rjw at apple.com>
 
+        Fix for 3138425. Don't open a new window when document.open() is called
+        with < 2 parameters.
+        
+        Reviewed by darin.
+
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLDocFunction::tryCall):
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall):
+
+2003-01-03  Richard Williamson   <rjw at apple.com>
+
         Fixed 3138743, 3138678, and 3138854.  Removed the RenderText
         widths cache, replaced it with a much simply monospace character
         cache.  Should be much faster for covered cases too!  Also fixed
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 64f58d1..64d67b6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2003-01-03  Richard Williamson   <rjw at apple.com>
 
+        Fix for 3138425. Don't open a new window when document.open() is called
+        with < 2 parameters.
+        
+        Reviewed by darin.
+
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLDocFunction::tryCall):
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall):
+
+2003-01-03  Richard Williamson   <rjw at apple.com>
+
         Fixed 3138743, 3138678, and 3138854.  Removed the RenderText
         widths cache, replaced it with a much simply monospace character
         cache.  Should be much faster for covered cases too!  Also fixed
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index 92c2377..345cd61 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -64,7 +64,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
     return Undefined();
   case HTMLDocument::Open:
     // For compatibility with other browsers, pass open calls with parameters to the window.
-    if (args.size() != 0) {
+    if (args.size() > 1) {
       KHTMLView *view = static_cast<DOM::DocumentImpl *>(doc.handle())->view();
       if (view) {
         KHTMLPart *part = view->part();
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index b4060fe..2ea66ad 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1065,6 +1065,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
         return Null();
   case Window::Open:
   {
+    printf ("window.open\n");
     KConfig *config = new KConfig("konquerorrc");
     config->setGroup("Java/JavaScript Settings");
     int policy = config->readUnsignedNumEntry( "WindowOpenPolicy", 0 ); // 0=allow, 1=ask, 2=deny, 3=smart

-- 
WebKit Debian packaging