From 62b4118e13ce4328ba808c1bd2cc0f73236a6b2e Mon Sep 17 00:00:00 2001 From: "jst%mozilla.jstenback.com" Date: Fri, 4 Feb 2005 16:54:11 +0000 Subject: [PATCH] Fixing bug 280664. Do security check for URI loads, no matter what plugin they come from. r=dveditz@cruzio.com, sr=brendan@mozilla.org git-svn-id: svn://10.0.0.236/trunk@168797 18797224-902f-48f8-a5cc-f745e15eee43 --- .../plugin/base/src/nsPluginHostImpl.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index d884c321781..2cd97e70660 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -902,9 +902,9 @@ nsPluginTag::nsPluginTag(const char* aName, mMimeDescriptionArray(nsnull), mExtensionsArray(nsnull), mLibrary(nsnull), - mCanUnloadLibrary(aCanUnload), mEntryPoint(nsnull), mFlags(0), + mCanUnloadLibrary(aCanUnload), mXPConnected(PR_FALSE), mLastModifiedTime(aLastModifiedTime) { @@ -2868,16 +2868,10 @@ NS_IMETHODIMP nsPluginHostImpl::GetURLWithHeaders(nsISupports* pluginInst, nsCOMPtr instance = do_QueryInterface(pluginInst, &rv); -#ifdef OJI if (NS_SUCCEEDED(rv)) { - // if this is a Java plugin calling, we need to do a security check - nsCOMPtr javaInstance(do_QueryInterface(instance)); - - if (javaInstance) - rv = DoURLLoadSecurityCheck(instance, url); + rv = DoURLLoadSecurityCheck(instance, url); } -#endif if (NS_SUCCEEDED(rv)) { @@ -2937,16 +2931,10 @@ NS_IMETHODIMP nsPluginHostImpl::PostURL(nsISupports* pluginInst, nsCOMPtr instance = do_QueryInterface(pluginInst, &rv); -#ifdef OJI if (NS_SUCCEEDED(rv)) { - // if this is a Java plugin calling, we need to do a security check - nsCOMPtr javaInstance(do_QueryInterface(instance)); - - if (javaInstance) - rv = DoURLLoadSecurityCheck(instance, url); + rv = DoURLLoadSecurityCheck(instance, url); } -#endif if (NS_SUCCEEDED(rv)) {