Mercurial > hg > openjdk > jdk8u > hotspot
changeset 6435:009de2b033fc
8029070: memory leak in jmm_SetVMGlobal
Reviewed-by: kvn, dholmes
| author | iignatyev |
|---|---|
| date | Mon, 23 Dec 2013 20:56:18 +0400 |
| parents | bcd72ab4d91f |
| children | 0c48231c5c84 |
| files | src/share/vm/runtime/globals.cpp src/share/vm/runtime/globals.hpp src/share/vm/runtime/globals_extension.hpp src/share/vm/services/management.cpp |
| diffstat | 4 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.cpp Thu Jan 16 13:25:25 2014 -0800 +++ b/src/share/vm/runtime/globals.cpp Mon Dec 23 20:56:18 2013 +0400 @@ -759,8 +759,6 @@ return true; } -// Contract: Flag will make private copy of the incoming value. -// Outgoing value is always malloc-ed, and caller MUST call free. bool CommandLineFlags::ccstrAtPut(char* name, size_t len, ccstr* value, Flag::Flags origin) { Flag* result = Flag::find_flag(name, len); if (result == NULL) return false; @@ -784,7 +782,6 @@ return true; } -// Contract: Flag will make private copy of the incoming value. void CommandLineFlagsEx::ccstrAtPut(CommandLineFlagWithType flag, ccstr value, Flag::Flags origin) { Flag* faddr = address_of_flag(flag); guarantee(faddr != NULL && faddr->is_ccstr(), "wrong flag type");
--- a/src/share/vm/runtime/globals.hpp Thu Jan 16 13:25:25 2014 -0800 +++ b/src/share/vm/runtime/globals.hpp Mon Dec 23 20:56:18 2013 +0400 @@ -390,6 +390,8 @@ static bool ccstrAt(char* name, size_t len, ccstr* value); static bool ccstrAt(char* name, ccstr* value) { return ccstrAt(name, strlen(name), value); } + // Contract: Flag will make private copy of the incoming value. + // Outgoing value is always malloc-ed, and caller MUST call free. static bool ccstrAtPut(char* name, size_t len, ccstr* value, Flag::Flags origin); static bool ccstrAtPut(char* name, ccstr* value, Flag::Flags origin) { return ccstrAtPut(name, strlen(name), value, origin); }
--- a/src/share/vm/runtime/globals_extension.hpp Thu Jan 16 13:25:25 2014 -0800 +++ b/src/share/vm/runtime/globals_extension.hpp Mon Dec 23 20:56:18 2013 +0400 @@ -201,6 +201,7 @@ static void uintxAtPut(CommandLineFlagWithType flag, uintx value, Flag::Flags origin); static void uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, Flag::Flags origin); static void doubleAtPut(CommandLineFlagWithType flag, double value, Flag::Flags origin); + // Contract: Flag will make private copy of the incoming value static void ccstrAtPut(CommandLineFlagWithType flag, ccstr value, Flag::Flags origin); static bool is_default(CommandLineFlag flag);
--- a/src/share/vm/services/management.cpp Thu Jan 16 13:25:25 2014 -0800 +++ b/src/share/vm/services/management.cpp Mon Dec 23 20:56:18 2013 +0400 @@ -1824,7 +1824,7 @@ "This flag is not writeable."); } - bool succeed; + bool succeed = false; if (flag->is_bool()) { bool bvalue = (new_value.z == JNI_TRUE ? true : false); succeed = CommandLineFlags::boolAtPut(name, &bvalue, Flag::MANAGEMENT); @@ -1856,6 +1856,9 @@ } ccstr svalue = java_lang_String::as_utf8_string(str); succeed = CommandLineFlags::ccstrAtPut(name, &svalue, Flag::MANAGEMENT); + if (succeed) { + FREE_C_HEAP_ARRAY(char, svalue, mtInternal); + } } assert(succeed, "Setting flag should succeed"); JVM_END