Revert "Fix infinite loop when parsing invalid regular expressions."

This reverts commit c1a7906.

Author: rozza

bson/src/main/org/bson/json/JsonBuffer.java

@@ -20,7 +20,6 @@ class JsonBuffer {
 
     private final String buffer;
     private int position;
-    private boolean eof;
 
     public JsonBuffer(final String buffer) {
         this.buffer = buffer;
@@ -35,19 +34,11 @@ public void setPosition(final int position) {
     }
 
     public int read() {
-        if (eof) {
-            throw new JsonParseException("Trying to read past EOF.");
-        } else if (position >= buffer.length()) {
-            eof = true;
-            return -1;
-        } else {
-            return buffer.charAt(position++);
-        }
+        return (position >= buffer.length()) ? -1 : buffer.charAt(position++);
     }
 
     public void unread(final int c) {
         if (c != -1 && buffer.charAt(position - 1) == c) {
-            eof = false;
             position--;
         }
     }

bson/src/main/org/bson/json/JsonScanner.java

@@ -134,9 +134,6 @@ private JsonToken scanRegularExpression() {
             switch (state) {
                 case IN_PATTERN:
                     switch (c) {
-                        case -1:
-                            state = RegularExpressionState.INVALID;
-                            break;
                         case '/':
                             state = RegularExpressionState.IN_OPTIONS;
                             options = buffer.getPosition();
@@ -177,7 +174,6 @@ private JsonToken scanRegularExpression() {
                     }
                     break;
                 default:
-                    break;
             }
 
             switch (state) {

bson/src/test/unit/org/bson/json/JsonBufferTest.java

@@ -503,15 +503,7 @@ public void testInvalidRegularExpression() {
         String json = "\t /pattern/nsk,";
         JsonBuffer buffer = new JsonBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
-        scanner.nextToken();
-    }
-
-    @Test(expected = JsonParseException.class)
-    public void testInvalidRegularExpressionNoEnd() {
-        String json = "/b";
-        JsonBuffer buffer = new JsonBuffer(json);
-        JsonScanner scanner = new JsonScanner(buffer);
-        scanner.nextToken();
+        JsonToken token = scanner.nextToken();
     }
 
     @Test(expected = JsonParseException.class)