Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Ratz2016-05-19 17:02:02 +0000
committerNiraj Modi2016-05-25 09:09:30 +0000
commit4b9b50badaff569fcc309f571d44e11426375523 (patch)
tree513e41ac836d810e8194281f8dabe795f425d525 /bundles/org.eclipse.swt/Eclipse SWT Browser
parent37331aac4e57335b3f248a1bb8afbe6d5b9f48c9 (diff)
downloadeclipse.platform.swt-4b9b50badaff569fcc309f571d44e11426375523.tar.gz
eclipse.platform.swt-4b9b50badaff569fcc309f571d44e11426375523.tar.xz
eclipse.platform.swt-4b9b50badaff569fcc309f571d44e11426375523.zip
Bug 476043 - Fix crash related to ActiveX Filtering in IE11
The IInternetSecurityManager::ProcessUrlAction API specification https://msdn.microsoft.com/en-us/library/ms537136(v=vs.85).aspx states that pContext can be NULL. This needs to be checked before trying to get the GUID. Change-Id: I4cb76929b0ff89f8616cc0b655fe56edcee11f4a Signed-off-by: Sebastian Ratz <sebastian.ratz@sap.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Browser')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
index f1527106c5..192136f836 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
@@ -604,7 +604,7 @@ int ProcessUrlAction(long /*int*/ pwszUrl, int dwAction, long /*int*/ pPolicy, i
ignoreNextMessage = true;
}
}
- if (dwAction == IE.URLACTION_ACTIVEX_RUN) {
+ if (dwAction == IE.URLACTION_ACTIVEX_RUN && pContext != 0) {
GUID guid = new GUID();
COM.MoveMemory(guid, pContext, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDJavaBeansBridge) && !canExecuteApplets ()) {

Back to the top