archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7073913: The fix for 7017193 causes segfaults

Browse source 
Buffer overflow in os::get_line_chars

Reviewed-by: coleenp, dholmes, dcubed
This commit is contained in:
Andrew Haley 2011-08-10 15:04:21 +04:00 • committed by Dmitry Samersoff
parent 28383f3e18
commit aefb3a004f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/share/vm/runtime/os.cpp
View file

@ -1299,7 +1299,7 @@ int os::get_line_chars(int fd, char* buf, const size_t bsize){
size_t sz, i = 0; size_t sz, i = 0;
// read until EOF, EOL or buf is full // read until EOF, EOL or buf is full
while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-1) && buf[i] != '\n') { while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') {
++i; ++i;
} }
@ -1320,7 +1320,7 @@ int os::get_line_chars(int fd, char* buf, const size_t bsize){
} }
// line is longer than size of buf, skip to EOL // line is longer than size of buf, skip to EOL
int ch; char ch;
while (read(fd, &ch, 1) == 1 && ch != '\n') { while (read(fd, &ch, 1) == 1 && ch != '\n') {
// Do nothing // Do nothing
} }