From b6de2a4ecc4512439b92ee953997eb600678c747 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 10 Jun 2006 02:41:46 +0000
Subject: [PATCH] Default to denying ActiveX loads if no JS is running.  Bug
 340852, patch by Wladimir Palant <trev@gtchat.de>, r=mrbkap, sr=bzbarsky

git-svn-id: svn://10.0.0.236/trunk@199657 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/activex/src/plugin/LegacyPlugin.cpp   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp b/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp
index cdaac0beb19..54d5bca15a9 100644
--- a/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp
+++ b/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp
@@ -459,18 +459,17 @@ WillHandleCLSID(const CLSID &clsid, PluginInstanceData *pData)
     nsCOMPtr<nsIDispatchSupport> dispSupport = do_GetService(NS_IDISPATCH_SUPPORT_CONTRACTID);
     if (!dispSupport)
         return FALSE;
+    JSContext * cx = GetPluginsContext(pData);
+    if (!cx)
+        return FALSE;
     nsCID cid;
     memcpy(&cid, &clsid, sizeof(nsCID));
     PRBool isSafe = PR_FALSE;
     PRBool classExists = PR_FALSE;
-    JSContext * cx = GetPluginsContext(pData);
-    if (cx)
-    {
-        nsCOMPtr<nsIURI> uri;
-        MozAxPlugin::GetCurrentLocation(pData->pPluginInstance, getter_AddRefs(uri));
-        MozAxAutoPushJSContext autoContext(cx, uri);
-        dispSupport->IsClassSafeToHost(cx, cid, PR_TRUE, &classExists, &isSafe);
-    }
+    nsCOMPtr<nsIURI> uri;
+    MozAxPlugin::GetCurrentLocation(pData->pPluginInstance, getter_AddRefs(uri));
+    MozAxAutoPushJSContext autoContext(cx, uri);
+    dispSupport->IsClassSafeToHost(cx, cid, PR_TRUE, &classExists, &isSafe);
     if (classExists && !isSafe)
         return FALSE;
     return TRUE;