[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 eba4635087f4de3ef5243475974a1b36c0cfed85
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 12 01:30:11 2003 +0000

            Reviewed by John.
    
    	- fixed 3479537 - reproducible crash in KJS::WindowFunc::tryCall
    
            * khtml/ecma/kjs_window.cpp:
            (WindowFunc::tryCall): Check part and doc impl for null.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5459 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 777e85e..89d20a0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-11-11  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by John.
+
+	- fixed 3479537 - reproducible crash in KJS::WindowFunc::tryCall
+	
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): Check part and doc impl for null.
+
+2003-11-11  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Ken.
 
 	- fixed 3472330 -  REGRESSION: onKeyPress handler not called when hitting keys in <input type=password> field
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index f1607fa..e1e1baa 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1080,7 +1080,8 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
 
   switch (id) {
   case Window::Alert:
-    part->xmlDocImpl()->updateRendering();
+    if (part && part->xmlDocImpl())
+      part->xmlDocImpl()->updateRendering();
 #if APPLE_CHANGES
     KWQ(part)->runJavaScriptAlert(str);
 #else
@@ -1088,7 +1089,8 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
 #endif
     return Undefined();
   case Window::Confirm:
-    part->xmlDocImpl()->updateRendering();
+    if (part && part->xmlDocImpl())
+      part->xmlDocImpl()->updateRendering();
 #if APPLE_CHANGES
     return Boolean(KWQ(part)->runJavaScriptConfirm(str));
 #else
@@ -1096,7 +1098,8 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
                                                 i18n("OK"), i18n("Cancel")) == KMessageBox::Yes));
 #endif
   case Window::Prompt:
-    part->xmlDocImpl()->updateRendering();
+    if (part && part->xmlDocImpl())
+      part->xmlDocImpl()->updateRendering();
     bool ok;
 #if APPLE_CHANGES
     ok = KWQ(part)->runJavaScriptPrompt(str, args.size() >= 2 ? args[1].toString(exec).qstring() : QString::null, str2);

-- 
WebKit Debian packaging