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
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user