Reviewed by Maciej.

	- fixed rdar://problem/3681094> Crash in KJS::WindowFunc::tryCall
        with application/xhtml+xml Content-Type
        * khtml/ecma/kjs_window.cpp:
        (WindowFunc::tryCall): since this is an xml document, we get the
	domain from the xmlDocImpl(), not docImpl().

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0233bd5037793e1f1d72ddd66833528dd10344dd..f4a77806bc4e4b88bc398e85108c27f965475bd1 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-08-23  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by Maciej.
+
+       - fixed rdar://problem/3681094> Crash in KJS::WindowFunc::tryCall       with application/xhtml+xml Content-Type
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): since this is an xml document, we get the
+       domain from the xmlDocImpl(), not docImpl().
+
 2004-08-23  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index d54d244365b9e980704d975b268f1f8496c436d5..74bc7ccfd227b970cde9a4c9dbc3a3df539449ca 100644 (file)
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1473,7 +1473,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
 
           if (part->xmlDocImpl()) {
             kdDebug(6070) << "Setting domain to " << part->xmlDocImpl()->domain().string() << endl;
-            khtmlpart->xmlDocImpl()->setDomain( part->docImpl()->domain(), true );
+            khtmlpart->xmlDocImpl()->setDomain( part->xmlDocImpl()->domain(), true );
           }
           
           if ( part->docImpl() )