Bug 495607 - Crash in ACTF browser when 'ActiveX Filter' is enabled in
IE11
diff --git a/plugins/org.eclipse.actf.model.ui.editors.ie/src/org/eclipse/actf/model/internal/ui/editors/ie/WebBrowserIEControlSite.java b/plugins/org.eclipse.actf.model.ui.editors.ie/src/org/eclipse/actf/model/internal/ui/editors/ie/WebBrowserIEControlSite.java
index 41a92d4..b67f22e 100644
--- a/plugins/org.eclipse.actf.model.ui.editors.ie/src/org/eclipse/actf/model/internal/ui/editors/ie/WebBrowserIEControlSite.java
+++ b/plugins/org.eclipse.actf.model.ui.editors.ie/src/org/eclipse/actf/model/internal/ui/editors/ie/WebBrowserIEControlSite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and Others
+ * Copyright (c) 2007, 2016 IBM Corporation and Others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* Takashi ITOH - initial API and implementation
+ * Kentarou FUKUDA - 495607
*******************************************************************************/
package org.eclipse.actf.model.internal.ui.editors.ie;
@@ -468,7 +469,7 @@
ignoreNextMessage = true;
}
- if (dwAction == URLACTION_ACTIVEX_RUN) {
+ if (dwAction == URLACTION_ACTIVEX_RUN && pContext != 0) {
GUID guid = new GUID();
COM.MoveMemory(guid, pContext, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDJavaBeansBridge)
