archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8144246: adding lots of directives via jcmd may produce OOM crash

Browse source 
Add a limit to the number of directives

Reviewed-by: kvn
This commit is contained in:
Nils Eliasson 2015-12-16 15:38:28 +01:00
parent e699dcb655
commit 8c0ad215bc
9 changed files with 46 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hotspot/src/share/vm/compiler/directivesParser.cpp
View file

@ -30,6 +30,7 @@
#include <string.h>
void DirectivesParser::push_tmp(CompilerDirectives* dir) {
_tmp_depth++;
dir->set_next(_tmp_top);
_tmp_top = dir;
}
@ -41,17 +42,29 @@ CompilerDirectives* DirectivesParser::pop_tmp() {
CompilerDirectives* tmp = _tmp_top;
_tmp_top = _tmp_top->next();
tmp->set_next(NULL);
_tmp_depth--;
return tmp;
}
void DirectivesParser::clean_tmp() {
CompilerDirectives* tmp = pop_tmp();
while (tmp != NULL) {
delete tmp;
tmp = pop_tmp();
}
assert(_tmp_depth == 0, "Consistency");
}
bool DirectivesParser::parse_string(const char* text, outputStream* st) {
DirectivesParser cd(text, st);
if (cd.valid()) {
return cd.install_directives();
} else {
cd.clean_tmp();
st->flush();
st->print_cr("Parsing of compiler directives failed");
return false;
}
st->flush();
st->print_cr("Parsing of compiler directives failed");
return false;
}
bool DirectivesParser::has_file() {
@ -91,6 +104,12 @@ bool DirectivesParser::parse_from_file_inner(const char* filename, outputStream*
}
bool DirectivesParser::install_directives() {
// Check limit
if (!DirectivesStack::check_capacity(_tmp_depth, _st)) {
clean_tmp();
return false;
}
// Pop from internal temporary stack and push to compileBroker.
CompilerDirectives* tmp = pop_tmp();
int i = 0;
@ -104,7 +123,7 @@ bool DirectivesParser::install_directives() {
return false;
} else {
_st->print_cr("%i compiler directives added", i);
if (PrintCompilerDirectives) {
if (CompilerDirectivesPrint) {
// Print entire directives stack after new has been pushed.
DirectivesStack::print(_st);
}
@ -113,7 +132,7 @@ bool DirectivesParser::install_directives() {
}
DirectivesParser::DirectivesParser(const char* text, outputStream* st)
: JSON(text, false, st), depth(0), current_directive(NULL), current_directiveset(NULL), _tmp_top(NULL) {
: JSON(text, false, st), depth(0), current_directive(NULL), current_directiveset(NULL), _tmp_top(NULL), _tmp_depth(0) {
#ifndef PRODUCT
memset(stack, 0, MAX_DEPTH * sizeof(stack[0]));
#endif
@ -121,6 +140,8 @@ DirectivesParser::DirectivesParser(const char* text, outputStream* st)
}
DirectivesParser::~DirectivesParser() {
assert(_tmp_top == NULL, "Consistency");
assert(_tmp_depth == 0, "Consistency");
}
const DirectivesParser::key DirectivesParser::keys[] = {
@ -584,6 +605,7 @@ void DirectivesParser::test(const char* text, bool should_pass) {
tty->print("-- DirectivesParser test failed as expected --\n");
}
}
cd.clean_tmp();
}
bool DirectivesParser::test() {