Merge pull request #61 from GanbaruTobi/master

Possible fix for Exception handling
netplex · Apr 1, 2021 · 5504116 · 5504116
2 parents ba7be16 + c98873a
commit 5504116
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java b/json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java
@@ -139,11 +139,19 @@ public void checkLeadinZero() throws ParseException {
 	protected Number extractFloat() throws ParseException {
 		if (!acceptLeadinZero)
 			checkLeadinZero();
-		if (!useHiPrecisionFloat)
-			return Float.parseFloat(xs);
-		if (xs.length() > 18) // follow JSonIJ parsing method
-			return new BigDecimal(xs);
-		return Double.parseDouble(xs);
+
+		try {
+			if (!useHiPrecisionFloat)
+				return Float.parseFloat(xs);
+
+			if (xs.length() > 18) // follow JSonIJ parsing method
+				return new BigDecimal(xs);
+
+			return Double.parseDouble(xs);
+
+		} catch(NumberFormatException e){
+			throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs);
+		}
 	}
 
 	/**