commit 1c51283f6ab8a6a828b2d154fbdc1aac17fca134
author Andrew Haley <aph@redhat.com> Wed Aug 10 15:04:21 2011 +0400
committer Dmitry Samersoff <dsamersoff@openjdk.org> Wed Aug 10 15:04:21 2011 +0400
tree b7e655fc00d3ad41b822dd5e964b52647f8534b2
parent d6b37040505398d0c13d210bb608684e34e94c1e

7073913: The fix for 7017193 causes segfaults

Buffer overflow in os::get_line_chars

Reviewed-by: coleenp, dholmes, dcubed

hotspot/src/share/vm/runtime/os.cpp

diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp
index 5da1108..28c6559 100644
--- a/hotspot/src/share/vm/runtime/os.cpp
+++ b/hotspot/src/share/vm/runtime/os.cpp
@@ -1299,7 +1299,7 @@
   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') {
+  while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') {
      ++i;
   }
 
@@ -1320,7 +1320,7 @@
   }
 
   // line is longer than size of buf, skip to EOL
-  int ch;
+  char ch;
   while (read(fd, &ch, 1) == 1 && ch != '\n') {
     // Do nothing
   }