Reviewed by me, done by Darin.

        - Darin fixed a regression I found from Darin's recent DOM change that broke GMail

        * khtml/ecma/kjs_window.cpp:
        (KJS::Window::get): Added nil check for document.
        (KJS::Window::hasProperty): Ditto.

        Test cases added: None (Darin should write one).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9227 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 35c2b1bdf979c7ac450adcc7511fe4e150b7afdf..6037f5692250b9237636aa0fa8a798ffd6325a50 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2005-05-27  Adele Peterson  <adele@apple.com>
+
+        Reviewed by me, done by Darin.
+
+        - Darin fixed a regression I found from Darin's recent DOM change that broke GMail
+
+        * khtml/ecma/kjs_window.cpp:
+        (KJS::Window::get): Added nil check for document.
+        (KJS::Window::hasProperty): Ditto.
+
+        Test cases added: None (Darin should write one).
+
 2005-05-27  Adele Peterson  <adele@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index ceaf25ccc63071af3e2dd15b1a0b267160527640..3185423397167a93a8c6f16bbdc02895ffd8e004 100644 (file)
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -876,7 +876,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
 
   // allow shortcuts like 'Image1' instead of document.images.Image1
   DocumentImpl *doc = m_part->xmlDocImpl();
-  if (isSafeScript(exec) && doc->isHTMLDocument()) { // might be XML
+  if (isSafeScript(exec) && doc && doc->isHTMLDocument()) { // might be XML
     NodeImpl *element = doc->all()->namedItem(p.string());
     if (element)
       return getDOMNode(exec, element);
@@ -912,7 +912,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const
 
   if (isSafeScript(exec)) {
     DocumentImpl *doc = m_part->xmlDocImpl();
-    if (doc->isHTMLDocument() && doc->all()->namedItem(p.string()))
+    if (doc && doc->isHTMLDocument() && doc->all()->namedItem(p.string()))
       return true;
   }