Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/arguments.cpp @ 10240:30860066ae8f
Merge
author | jwilhelm |
---|---|
date | Mon, 06 May 2013 13:03:46 +0200 |
parents | e01e02a9fcb6 1d0fba8a2a6d |
children | d17700c82d7d |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Fri May 03 08:19:38 2013 -0700 +++ b/src/share/vm/runtime/arguments.cpp Mon May 06 13:03:46 2013 +0200 @@ -747,16 +747,16 @@ return; } - int index = *count; + int new_count = *count + 1; // expand the array and add arg to the last element - (*count)++; if (*bldarray == NULL) { - *bldarray = NEW_C_HEAP_ARRAY(char*, *count, mtInternal); + *bldarray = NEW_C_HEAP_ARRAY(char*, new_count, mtInternal); } else { - *bldarray = REALLOC_C_HEAP_ARRAY(char*, *bldarray, *count, mtInternal); + *bldarray = REALLOC_C_HEAP_ARRAY(char*, *bldarray, new_count, mtInternal); } - (*bldarray)[index] = strdup(arg); + (*bldarray)[*count] = strdup(arg); + *count = new_count; } void Arguments::build_jvm_args(const char* arg) {