diff src/share/vm/runtime/globals.cpp @ 372:be41fa651400

Merge
author rasbold
date Tue, 30 Sep 2008 15:53:55 -0700
parents 1ee8caae33af 885fe0f95828
children 473cce303f13
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.cpp	Wed Sep 24 15:34:06 2008 -0400
+++ b/src/share/vm/runtime/globals.cpp	Tue Sep 30 15:53:55 2008 -0700
@@ -365,8 +365,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.