cvs commit: jakarta-watchdog-4.0/src/tools/org/apache/watchdog/task GTest.java

rlubke      2002/06/24 10:21:40

  Modified:    src/tools/org/apache/watchdog/task GTest.java
  Log:
  Fix for 10184.  Avoids boundry condition.
  
  Revision  Changes    Path
  1.10      +9 -3      jakarta-watchdog-4.0/src/tools/org/apache/watchdog/task/GTest.java
  
  Index: GTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/tools/org/apache/watchdog/task/GTest.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- GTest.java	13 Jun 2002 12:47:23 -0000	1.9
  +++ GTest.java	24 Jun 2002 17:21:40 -0000	1.10
  @@ -1600,6 +1600,12 @@
               }
               int val = buf[pos++] & 0xff;
               if ( val == CARRIAGE_RETURN ) {
  +                if (pos >= count) {
  +                    fill();
  +                    if (pos >= count) {
  +                       return -1;
  +                    }
  +                }
                   return buf[pos++] & 0xff;
               }
               return val;