From 4b9b50badaff569fcc309f571d44e11426375523 Mon Sep 17 00:00:00 2001 From: Sebastian Ratz Date: Thu, 19 May 2016 19:02:02 +0200 Subject: 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 --- .../Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ()) { -- cgit v1.2.3