Reviewed by Ken.

	<rdar://problem/3965196> security fix for javascript: exploit missed one case (already fixed in updates)

	* khtml/ecma/kjs_window.cpp:
        (WindowFunc::tryCall): correct mistake in earlier fix for the following bug, caught by Adele:

	<rdar://problem/3790449> REGRESSION (Mail): underline behavior is flaky because of how CSS handles text-decoration

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d910ecb3c54e60f0effc718bd11480cca8b9a989..ef679ffa4b24ad7597407a89d66560f93a61c4cd 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2005-01-20  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Ken.
+
+       <rdar://problem/3965196> security fix for javascript: exploit missed one case (already fixed in updates)
+        
+       * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): correct mistake in earlier fix for the following bug, caught by Adele:
+
+       <rdar://problem/3790449> REGRESSION (Mail): underline behavior is flaky because of how CSS handles text-decoration
+
 2005-01-20  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Ken.

diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 406c9ebfcaf7a8110f2c86b6f6621b6579e746e5..be79603659ff7c7ce6e532f5f6cac2e9aa63e636 100644 (file)
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1602,7 +1602,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
         }
 #if APPLE_CHANGES
         if (!url.isEmpty()) {
-          const Window* window = Window::retrieveWindow(part);
+          const Window* window = Window::retrieveWindow(khtmlpart);
           if (!url.url().startsWith("javascript:", false) || (window && window->isSafeScript(exec))) {
             bool userGesture = static_cast<ScriptInterpreter *>(exec->dynamicInterpreter())->wasRunByUserGesture();
             // FIXME: Need to pass referrer here.