diff options
author | Deepak Bhole <[email protected]> | 2012-01-09 18:45:31 -0500 |
---|---|---|
committer | Deepak Bhole <[email protected]> | 2012-01-09 18:45:31 -0500 |
commit | 36bd792b00d8402ba2c71e17e6374a6c221b5ca2 (patch) | |
tree | ef4a19a386d99b20591b152bea25ccb8e398becf /plugin/icedteanp | |
parent | 12ea54672f72e38a5913377bf07f50cb14f51a18 (diff) |
PR838: IcedTea plugin crashes with chrome browser when javascript is executedicedtea-web-1.2-branchpoint
Diffstat (limited to 'plugin/icedteanp')
-rw-r--r-- | plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 8 |
1 files changed, 7 insertions, 1 deletions
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 "; |