diff options
| author | markd <markd@pkgsrc.org> | 2004-12-14 11:02:18 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2004-12-14 11:02:18 +0000 |
| commit | c1dda370fc25d55d136d3aaae54506d5793fa1fa (patch) | |
| tree | 6d32096c8292c594b5645b938304d76176992e0c /x11/kdebase3/patches | |
| parent | 9056b0fc7f2ec550ff1c210d9cfb1e741e868e5f (diff) | |
| download | pkgsrc-c1dda370fc25d55d136d3aaae54506d5793fa1fa.tar.gz | |
Part of fix of Konqueror Window Injection Vulnerability.
From http://www.kde.org/info/security/advisory-20041213-1.txt.
Bump PKGREVISION.
Diffstat (limited to 'x11/kdebase3/patches')
| -rw-r--r-- | x11/kdebase3/patches/patch-am | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/x11/kdebase3/patches/patch-am b/x11/kdebase3/patches/patch-am new file mode 100644 index 00000000000..40f69160558 --- /dev/null +++ b/x11/kdebase3/patches/patch-am @@ -0,0 +1,36 @@ +$NetBSD: patch-am,v 1.10 2004/12/14 11:05:27 markd Exp $ + +--- konqueror/konq_mainwindow.cc.orig 2004-11-29 06:27:03.000000000 +1300 ++++ konqueror/konq_mainwindow.cc +@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP + QString viewName = view->viewName(); + kdDebug() << " - viewName=" << viewName << " " + << "frame names:" << view->frameNames().join( "," ) << endl; ++ ++ // First look for a hostextension containing this frame name ++ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() ); ++ if ( ext ) ++ { ++ ext = ext->findFrameParent(callingPart, name); ++ kdDebug() << "BrowserHostExtension found part " << ext << endl; ++ if (!ext) ++ continue; // Don't use this window ++ } ++ + if ( !viewName.isEmpty() && viewName == name ) + { + kdDebug() << "found existing view by name: " << view << endl; +@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP + return view; + } + +- // First look for a hostextension containing this frame name +- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() ); +- if ( ext ) +- { +- ext = ext->findFrameParent(callingPart, name); +- } +- + // KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name ); + + if ( ext ) |