From 0c5cf182552f0c2564c0d0d0b253829988d8a1e1 Mon Sep 17 00:00:00 2001
From: Simulant <nfaupel.dev@gmail.com>
Date: Sun, 10 Mar 2024 21:12:28 +0100
Subject: [PATCH] Revert "#863 improve performance of JSONTokener#nextString"

This reverts commit 63625b3c622407273d2654660be7659ac5d74db7.
---
 src/main/java/org/json/JSONTokener.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
index 96dc71c..0bc6dfb 100644
--- a/src/main/java/org/json/JSONTokener.java
+++ b/src/main/java/org/json/JSONTokener.java
@@ -295,9 +295,12 @@ public class JSONTokener {
         StringBuilder sb = new StringBuilder();
         for (;;) {
             c = this.next();
-            if (c == quote) {
-                return sb.toString();
-            } else if (c == '\\') {
+            switch (c) {
+            case 0:
+            case '\n':
+            case '\r':
+                throw this.syntaxError("Unterminated string");
+            case '\\':
                 c = this.next();
                 switch (c) {
                 case 'b':
@@ -331,9 +334,11 @@ public class JSONTokener {
                 default:
                     throw this.syntaxError("Illegal escape.");
                 }
-            } else if (c == 0 || c == '\n' || c == '\r') {
-                throw this.syntaxError("Unterminated string");
-            } else {
+                break;
+            default:
+                if (c == quote) {
+                    return sb.toString();
+                }
                 sb.append(c);
             }
         }