mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 19:14:38 +02:00
Merge
This commit is contained in:
commit
453d1a42b0
34 changed files with 1490 additions and 493 deletions
|
@ -365,8 +365,11 @@ bool CommandLineFlags::ccstrAtPut(char* name, size_t len, ccstr* value, FlagValu
|
|||
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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue