From 3e7a0b13d1c2ed0b18d5ba143ddaaf171c72932a Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Tue, 17 Sep 2019 10:36:48 -0400
Subject: [PATCH 1/3] new test case for issue 484

---
 src/test/java/org/json/junit/JSONMLTest.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 84b33ba..26f4f90 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -803,4 +803,16 @@ public void testToJSONObject_reversibility() {
 //
 //        assertEquals(expectedJsonString, actualJsonString);
 //    }
+    
+    @Test (timeout = 6000)
+    public void testIssue484InfinteLoop() {
+        try {
+            JSONML.toJSONObject("??*^M??|?CglR^F??`??>?w??PIlr^E??D^X^]?$?-^R?o??O?*??{OD?^FY??`2a????NM?b^Tq?:O?>S$^K?J?^FB.gUK?m^H??zE??^??!v]?^A???^[^A??^U?c??????h???s???g^Z???`?q^Dbi??:^QZl?)?}1^??k?0??:$V?$?Ovs(}J??^V????2;^QgQ?^_^A?^D?^U?Tg?K?`?h%c?hmGA?<!C*^P^Y?^X9?~?t?)??,z^XA???S}?Q??.q?j????]");
+            fail("Exception expected for invalid JSON.");
+        } catch (JSONException ex) {
+            assertEquals("Exception string did not match: ",
+                    "Unterminated string at 271 [character 272 line 1]",
+                    ex.getMessage());
+        }
+    }
 }

From 67e59888a2764d5b36fa133473563d70da4136ac Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Tue, 17 Sep 2019 11:14:41 -0400
Subject: [PATCH 2/3] add second case for data in #484

---
 src/test/java/org/json/junit/JSONMLTest.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 26f4f90..b7afe40 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -2,6 +2,8 @@
 
 import static org.junit.Assert.*;
 
+import java.util.Base64;
+
 import org.json.*;
 import org.junit.Test;
 
@@ -805,7 +807,7 @@ public void testToJSONObject_reversibility() {
 //    }
     
     @Test (timeout = 6000)
-    public void testIssue484InfinteLoop() {
+    public void testIssue484InfinteLoop1() {
         try {
             JSONML.toJSONObject("??*^M??|?CglR^F??`??>?w??PIlr^E??D^X^]?$?-^R?o??O?*??{OD?^FY??`2a????NM?b^Tq?:O?>S$^K?J?^FB.gUK?m^H??zE??^??!v]?^A???^[^A??^U?c??????h???s???g^Z???`?q^Dbi??:^QZl?)?}1^??k?0??:$V?$?Ovs(}J??^V????2;^QgQ?^_^A?^D?^U?Tg?K?`?h%c?hmGA?<!C*^P^Y?^X9?~?t?)??,z^XA???S}?Q??.q?j????]");
             fail("Exception expected for invalid JSON.");
@@ -815,4 +817,18 @@ public void testIssue484InfinteLoop() {
                     ex.getMessage());
         }
     }
+    
+    @Test (timeout = 6000)
+    public void testIssue484InfinteLoop2() {
+        try {
+            String input = "??*\n" + 
+                    "??|?CglR??`??>?w??PIlr??D?$?-?o??O?*??{OD?Y??`2a????NM?bq?:O?>S$?J?B.gUK?m\b??zE???!v]?
???
???c??????h???s???g???`?qbi??:Zl?)?}1^??k?0??:$V?$?Ovs(}J??????2;gQ?
???Tg?K?`?h%c?hmGA?<!C*?9?~?t?)??,zA???S}?Q??.q?j????]";
+         JSONML.toJSONObject(input);
+            fail("Exception expected for invalid JSON.");
+        } catch (JSONException ex) {
+            assertEquals("Exception string did not match: ",
+                    "Unterminated string at 242 [character 238 line 2]",
+                    ex.getMessage());
+        }
+    }
 }

From a24db2cce292a7df46b41c6b722de2f6ba1a4be6 Mon Sep 17 00:00:00 2001
From: "John J. Aylward" <john.aylward@sagenet.com>
Date: Tue, 17 Sep 2019 11:15:25 -0400
Subject: [PATCH 3/3] remove unused import

---
 src/test/java/org/json/junit/JSONMLTest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index b7afe40..3687fe5 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -2,8 +2,6 @@
 
 import static org.junit.Assert.*;
 
-import java.util.Base64;
-
 import org.json.*;
 import org.junit.Test;