diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 8 |
3 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2012-01-09 Deepak Bhole <[email protected]> + + PR838: IcedTea plugin crashes with chrome browser when javascript is executed + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (eval): Added a check + to ensure that the result pointer is valid before attempting to create an + NPVariant from it. + 2012-01-05 Omair Majid <[email protected]> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java @@ -21,6 +21,7 @@ New in release 1.2 (2011-XX-XX): * Plugin - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow - PR782: Support building against npapi-sdk as well + - PR838: IcedTea plugin crashes with chrome browser when javascript is executed - RH586194: Unable to connect to connect with Juniper VPN client - RH718693: MindTerm SSH Applet doesn't work Common diff --git a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc index a5937d2..77d5356 100644 --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc @@ -243,7 +243,13 @@ PluginRequestProcessor::eval(std::vector<std::string*>* message_parts) NPVariant* result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result); std::string result_variant_jniid = std::string(); - createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); + if (result_variant) + { + createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid); + } else + { + result_variant_jniid = "0"; + } IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); response += " JavaScriptEval "; |