From e829cc9f9d39b87a95324a0912da9418b53aaf93 Mon Sep 17 00:00:00 2001 From: Dan Armak Date: Wed, 11 Sep 2002 07:51:12 +0000 Subject: missing patch --- .../kdelibs/files/kdelibs-2.2.2a-crosside.diff | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 kde-base/kdelibs/files/kdelibs-2.2.2a-crosside.diff (limited to 'kde-base') diff --git a/kde-base/kdelibs/files/kdelibs-2.2.2a-crosside.diff b/kde-base/kdelibs/files/kdelibs-2.2.2a-crosside.diff new file mode 100644 index 000000000000..381eb166c6f6 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-2.2.2a-crosside.diff @@ -0,0 +1,24 @@ +--- khtml/ecma/kjs_html.cpp 2002/01/08 13:42:53 1.108.2.3 ++++ khtml/ecma/kjs_html.cpp 2002/09/10 16:31:26 1.108.2.4 +@@ -858,7 +858,6 @@ KJSO KJS::HTMLElement::tryGet(const UStr + case ID_FRAME: { + DOM::HTMLFrameElement frameElement = element; + +- // p == "document" ? + if (p == "frameBorder") return getString(frameElement.frameBorder()); + else if (p == "longDesc") return getString(frameElement.longDesc()); + else if (p == "marginHeight") return getString(frameElement.marginHeight()); +@@ -873,9 +872,11 @@ KJSO KJS::HTMLElement::tryGet(const UStr + break; + case ID_IFRAME: { + DOM::HTMLIFrameElement iFrame = element; ++ KHTMLPart* part = iFrame.isNull() ? 0 : static_cast(iFrame.handle() )->frameDocument()->view()->part(); + if (p == "align") return getString(iFrame.align()); +- // ### security check ? +- else if (p == "document") { ++ else if ((iFrame.src().isEmpty() || !part || originCheck(part->url(), Window::retrieveActive()->part()->url())) ++ ++ && p == "document") { + if ( !iFrame.isNull() ) + return getDOMNode( static_cast(iFrame.handle() )->frameDocument() ); + -- cgit v1.2.3-65-gdbad