7017193: Small memory leak in get_stack_bounds os::create_stack_guard_pages

Getline() returns -1 but still allocate memory for str

Reviewed-by: dcubed, coleenp
This commit is contained in:
Dmitry Samersoff 2011-03-30 19:38:07 +04:00
parent 66a08540c2
commit 52bf12aead
3 changed files with 70 additions and 34 deletions

View file

@ -1291,3 +1291,41 @@ bool os::is_server_class_machine() {
}
return result;
}
// Read file line by line, if line is longer than bsize,
// skip rest of line.
int os::get_line_chars(int fd, char* buf, const size_t bsize){
size_t sz, i = 0;
// read until EOF, EOL or buf is full
while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-1) && buf[i] != '\n') {
++i;
}
if (buf[i] == '\n') {
// EOL reached so ignore EOL character and return
buf[i] = 0;
return (int) i;
}
buf[i+1] = 0;
if (sz != 1) {
// EOF reached. if we read chars before EOF return them and
// return EOF on next call otherwise return EOF
return (i == 0) ? -1 : (int) i;
}
// line is longer than size of buf, skip to EOL
int ch;
while (read(fd, &ch, 1) == 1 && ch != '\n') {
// Do nothing
}
// return initial part of line that fits in buf.
// If we reached EOF, it will be returned on next call.
return (int) i;
}