aboutsummaryrefslogtreecommitdiff
path: root/src/share
diff options
context:
space:
mode:
authorzgu <none@none>2012-11-28 09:19:38 -0500
committerzgu <none@none>2012-11-28 09:19:38 -0500
commit8230970c12ca541dc9438a38632dbab337386d6c (patch)
tree947dd0101cc469b0063e80cfa0f82bb5db106f94 /src/share
parentc8800755dc72e2e3e4e1aa35a1af8035cae7764a (diff)
8003689: MemTracker::init_tracking_options() reads outside array if commandline argument is empty
Summary: Fixed potential buffer overrun when giving empty option to NativeMemoryTracking commandline option Reviewed-by: ctornqvi, hseigel, kvn
Diffstat (limited to 'src/share')
-rw-r--r--src/share/vm/services/memTracker.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/share/vm/services/memTracker.cpp b/src/share/vm/services/memTracker.cpp
index 3cec67868..ebb690a1b 100644
--- a/src/share/vm/services/memTracker.cpp
+++ b/src/share/vm/services/memTracker.cpp
@@ -69,15 +69,12 @@ NOT_PRODUCT(volatile jint MemTracker::_pending_recorder_count = 0;)
void MemTracker::init_tracking_options(const char* option_line) {
_tracking_level = NMT_off;
- if (strncmp(option_line, "=summary", 8) == 0) {
+ if (strcmp(option_line, "=summary") == 0) {
_tracking_level = NMT_summary;
- } else if (strncmp(option_line, "=detail", 7) == 0) {
+ } else if (strcmp(option_line, "=detail") == 0) {
_tracking_level = NMT_detail;
- } else {
- char msg[255];
- //+1 to remove the '=' character
- jio_snprintf(msg, 255, "Unknown option given to XX:NativeMemoryTracking: %s", option_line+1);
- vm_exit_during_initialization(msg, NULL);
+ } else if (strcmp(option_line, "=off") != 0) {
+ vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL);
}
}