Merge pull request usnistgov#52 from andrey-vorobiev/check-bounds

Do not use exceptions for control flow in StringTokenizer.lookAhead
vladimirralev · Jan 1, 2020 · b1a5142 · b1a5142
2 parents 31d96d6 + b20d7db
commit b1a5142
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/gov/nist/core/StringTokenizer.java b/src/gov/nist/core/StringTokenizer.java
@@ -134,12 +134,8 @@ public char lookAhead() throws ParseException {
 
     public char lookAhead(int k) throws ParseException {
         // Debug.out.println("ptr = " + ptr);
-        try {
-            return buffer[ptr + k];
-        }
-        catch (IndexOutOfBoundsException e) {
-            return '\0';
-        }
+        int index = ptr + k;
+        return index < buffer.length ? buffer[index] : '\0';
     }
 
     public char getNextChar() throws ParseException {