Mercurial > hg > truffle
changeset 370:885fe0f95828
6744783: HotSpot segfaults if given -XX options with an empty string argument
Reviewed-by: kamg, kvn
Contributed-by: volker.simonis@gmail.com
author | never |
---|---|
date | Thu, 25 Sep 2008 12:50:51 -0700 |
parents | 5f85534046c2 |
children | dbec32712472 |
files | src/share/vm/prims/jvmtiTrace.cpp src/share/vm/runtime/globals.cpp src/share/vm/runtime/globals.hpp |
diffstat | 3 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiTrace.cpp Wed Sep 24 15:56:36 2008 -0700 +++ b/src/share/vm/prims/jvmtiTrace.cpp Thu Sep 25 12:50:51 2008 -0700 @@ -73,7 +73,7 @@ const char *very_end; const char *curr; - if (strlen(TraceJVMTI)) { + if (TraceJVMTI != NULL) { curr = TraceJVMTI; } else { curr = ""; // hack in fixed tracing here
--- a/src/share/vm/runtime/globals.cpp Wed Sep 24 15:56:36 2008 -0700 +++ b/src/share/vm/runtime/globals.cpp Thu Sep 25 12:50:51 2008 -0700 @@ -355,8 +355,11 @@ if (result == NULL) return false; if (!result->is_ccstr()) return false; ccstr old_value = result->get_ccstr(); - char* new_value = NEW_C_HEAP_ARRAY(char, strlen(*value)+1); - strcpy(new_value, *value); + char* new_value = NULL; + if (*value != NULL) { + new_value = NEW_C_HEAP_ARRAY(char, strlen(*value)+1); + strcpy(new_value, *value); + } result->set_ccstr(new_value); if (result->origin == DEFAULT && old_value != NULL) { // Prior value is NOT heap allocated, but was a literal constant.
--- a/src/share/vm/runtime/globals.hpp Wed Sep 24 15:56:36 2008 -0700 +++ b/src/share/vm/runtime/globals.hpp Thu Sep 25 12:50:51 2008 -0700 @@ -692,7 +692,7 @@ diagnostic(bool, PrintAssembly, false, \ "Print assembly code (using external disassembler.so)") \ \ - diagnostic(ccstr, PrintAssemblyOptions, false, \ + diagnostic(ccstr, PrintAssemblyOptions, NULL, \ "Options string passed to disassembler.so") \ \ diagnostic(bool, PrintNMethods, false, \ @@ -833,7 +833,7 @@ "Use LWP-based instead of libthread-based synchronization " \ "(SPARC only)") \ \ - product(ccstr, SyncKnobs, "", \ + product(ccstr, SyncKnobs, NULL, \ "(Unstable) Various monitor synchronization tunables") \ \ product(intx, EmitSync, 0, \ @@ -1017,7 +1017,7 @@ notproduct(bool, TraceJVMCalls, false, \ "Trace JVM calls") \ \ - product(ccstr, TraceJVMTI, "", \ + product(ccstr, TraceJVMTI, NULL, \ "Trace flags for JVMTI functions and events") \ \ /* This option can change an EMCP method into an obsolete method. */ \