jdk8-mips64-public/hotspot: comparison src/share/vm/runtime/arguments.cpp

-:b5f2f874db7c
+:e73d79ce00e4
 const char* ext = name + strlen(name) - 4;
 bool isJarOrZip = ext > name &&
 (os::file_name_strcmp(ext, ".jar") == 0 ||
 os::file_name_strcmp(ext, ".zip") == 0);
 if (isJarOrZip) {
-char* jarpath = NEW_C_HEAP_ARRAY(char, directory_len + 2 + strlen(name), mtInternal);
+size_t length = directory_len + 2 + strlen(name);
-sprintf(jarpath, "%s%s%s", directory, dir_sep, name);
+char* jarpath = NEW_C_HEAP_ARRAY(char, length, mtInternal);
+jio_snprintf(jarpath, length, "%s%s%s", directory, dir_sep, name);
 path = add_to_path(path, jarpath, false);
 FREE_C_HEAP_ARRAY(char, jarpath, mtInternal);
 }
 }
 FREE_C_HEAP_ARRAY(char, dbuf, mtInternal);
 if (old_len == 0) {
 value = new_value;
 } else if (new_len == 0) {
 value = old_value;
 } else {
-char* buf = NEW_C_HEAP_ARRAY(char, old_len + 1 + new_len + 1, mtInternal);
+size_t length = old_len + 1 + new_len + 1;
+char* buf = NEW_C_HEAP_ARRAY(char, length, mtInternal);
 // each new setting adds another LINE to the switch:
-sprintf(buf, "%s\n%s", old_value, new_value);
+jio_snprintf(buf, length, "%s\n%s", old_value, new_value);
 value = buf;
 free_this_too = buf;
 }
 (void) CommandLineFlags::ccstrAtPut(name, &value, origin);
 // CommandLineFlags always returns a pointer that needs freeing.
 // strings in a given char** array
 const char* Arguments::build_resource_string(char** args, int count) {
 if (args == NULL || count == 0) {
 return NULL;
 }
-size_t length = strlen(args[0]) + 1; // add 1 for the null terminator
+size_t length = 0;
-for (int i = 1; i < count; i++) {
+for (int i = 0; i < count; i++) {
-length += strlen(args[i]) + 1; // add 1 for a space
+length += strlen(args[i]) + 1; // add 1 for a space or NULL terminating character
 }
 char* s = NEW_RESOURCE_ARRAY(char, length);
-strcpy(s, args[0]);
+char* dst = s;
-for (int j = 1; j < count; j++) {
+for (int j = 0; j < count; j++) {
-strcat(s, " ");
+size_t offset = strlen(args[j]) + 1; // add 1 for a space or NULL terminating character
-strcat(s, args[j]);
+jio_snprintf(dst, length, "%s ", args[j]); // jio_snprintf will replace the last space character with NULL character
+dst += offset;
+length -= offset;
 }
 return (const char*) s;
 }
 void Arguments::print_on(outputStream* st) {
 FLAG_SET_DEFAULT(AutoBoxCacheMax, 20000);
 }
 // Feed the cache size setting into the JDK
 char buffer[1024];
-sprintf(buffer, "java.lang.Integer.IntegerCache.high=" INTX_FORMAT, AutoBoxCacheMax);
+jio_snprintf(buffer, 1024, "java.lang.Integer.IntegerCache.high=" INTX_FORMAT, AutoBoxCacheMax);
 add_property(buffer);
 }
 if (AggressiveOpts && FLAG_IS_DEFAULT(BiasedLockingStartupDelay)) {
 FLAG_SET_DEFAULT(BiasedLockingStartupDelay, 500);
 }
 char* name = strncpy(NEW_C_HEAP_ARRAY(char, len + 1, mtInternal), tail, len);
 name[len] = '\0';
 char *options = NULL;
 if(pos != NULL) {
-options = strcpy(NEW_C_HEAP_ARRAY(char, strlen(pos + 1) + 1, mtInternal), pos + 1);
+size_t length = strlen(pos + 1) + 1;
+options = NEW_C_HEAP_ARRAY(char, length, mtInternal);
+jio_snprintf(options, length, "%s", pos + 1);
 }
 #if !INCLUDE_JVMTI
 if (valid_hprof_or_jdwp_agent(name, is_absolute_path)) {
 jio_fprintf(defaultStream::error_stream(),
 "Profiling and debugging agents are not supported in this VM\n");
 jio_fprintf(defaultStream::error_stream(),
 "Instrumentation agents are not supported in this VM\n");
 return JNI_ERR;
 #else
 if(tail != NULL) {
-char *options = strcpy(NEW_C_HEAP_ARRAY(char, strlen(tail) + 1, mtInternal), tail);
+size_t length = strlen(tail) + 1;
+char *options = NEW_C_HEAP_ARRAY(char, length, mtInternal);
+jio_snprintf(options, length, "%s", tail);
 add_init_agent("instrument", options, false);
 }
 #endif // !INCLUDE_JVMTI
 // -Xnoclassgc
 } else if (match_option(option, "-Xnoclassgc", &tail)) {
 if (!add_property("java.awt.headless=true")) {
 return JNI_ENOMEM;
 }
 } else {
 char buffer[256];
-strcpy(buffer, "java.awt.headless=");
+jio_snprintf(buffer, 256, "java.awt.headless=%s", envbuffer);
-strcat(buffer, envbuffer);
 if (!add_property(buffer)) {
 return JNI_ENOMEM;
 }
 }
 }

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/runtime/arguments.cpp

src/share/vm/runtime/arguments.cpp