Mercurial > hg > truffle
diff src/share/vm/runtime/globals.cpp @ 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 | d1605aabd0a1 |
children | be41fa651400 |
line wrap: on
line diff
--- 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.