--- a/hotspot/src/share/vm/runtime/os.cpp	Thu Jul 28 14:10:21 2011 -0400
+++ b/hotspot/src/share/vm/runtime/os.cpp	Wed Aug 10 15:04:21 2011 +0400
@@ -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
   }