Fix issue for semi-strings as well

Author: wb9688

src/main/java/com/grack/nanojson/JsonTokener.java

@@ -361,9 +361,7 @@ void consumeTokenString(int cc) throws JsonParserException {
 						// Make sure that there's enough chars for a \\uXXXX escape
 						if (buffer[index] == 'u' && n < MAX_ESCAPE) {
 							index = bufferLength; // Reset index to last valid location
-							throw createParseException(null,
-									"EOF encountered in the middle of a string escape",
-									false);
+							throw createParseException(null, "EOF encountered in the middle of a string escape", false);
 						}
 					}
 					char escape = buffer[index++];
@@ -420,9 +418,7 @@ void consumeTokenString(int cc) throws JsonParserException {
 
 			if (index > bufferLength) {
 				index = bufferLength; // Reset index to last valid location
-				throw createParseException(null,
-						"EOF encountered in the middle of a string escape",
-						false);
+				throw createParseException(null, "EOF encountered in the middle of a string escape", false);
 			}
 		}
 	}
@@ -439,8 +435,9 @@ void consumeTokenSemiString() throws JsonParserException {
 			for (int i = 0; i < n; i++) {
 				char c = stringChar();
 				if (isWhitespace(c) || c == ':') {
-					fixupAfterRawBufferRead();
+					// Use the index before we fixup
 					reusableBuffer.append(buffer, index - i - 1, i);
+					fixupAfterRawBufferRead();
 					return;
 				}
 				if (c == '\\' || (utf8 && (c & 0x80) != 0)) {
@@ -487,6 +484,17 @@ void consumeTokenSemiString() throws JsonParserException {
 				case ',':
 					throw createParseException(null, "Invalid character in semi-string: " + c, false);
 				case '\\':
+					// Ensure that we have at least MAX_ESCAPE here in the buffer
+					if (end - index < MAX_ESCAPE) {
+						// Re-adjust the buffer end, unlikely path
+						n = ensureBuffer(MAX_ESCAPE);
+						end = index + n;
+						// Make sure that there's enough chars for a \\uXXXX escape
+						if (buffer[index] == 'u' && n < MAX_ESCAPE) {
+							index = bufferLength; // Reset index to last valid location
+							throw createParseException(null, "EOF encountered in the middle of a string escape", false);
+						}
+					}
 					char escape = buffer[index++];
 					switch (escape) {
 						case 'b':
@@ -540,9 +548,7 @@ void consumeTokenSemiString() throws JsonParserException {
 
 			if (index > bufferLength) {
 				index = bufferLength; // Reset index to last valid location
-				throw createParseException(null,
-						"EOF encountered in the middle of a string escape",
-						false);
+				throw createParseException(null, "EOF encountered in the middle of a string escape", false);
 			}
 		}
 	}