1063-alt-min initial commit

Author: Sean Leary

src/main/java/org/json/JSONObject.java

@@ -1314,7 +1314,11 @@ public Boolean optBooleanObject(String key, Boolean defaultValue) {
      */
     public BigDecimal optBigDecimal(String key, BigDecimal defaultValue) {
         Object val = this.opt(key);
-        return objectToBigDecimal(val, defaultValue);
+        try {
+            return objectToBigDecimal(val, defaultValue);
+        } catch (JSONException jsonException) {
+            return defaultValue;
+        }
     }
 
     /**
@@ -1363,6 +1367,9 @@ static BigDecimal objectToBigDecimal(Object val, BigDecimal defaultValue, boolea
         }
         // don't check if it's a string in case of unchecked Number subclasses
         try {
+            if (val.toString().length() > 1000) {
+                throw new JSONException("Value too long for BigDecimal");
+            }
             return new BigDecimal(val.toString());
         } catch (Exception e) {
             return defaultValue;
@@ -1382,7 +1389,11 @@ static BigDecimal objectToBigDecimal(Object val, BigDecimal defaultValue, boolea
      */
     public BigInteger optBigInteger(String key, BigInteger defaultValue) {
         Object val = this.opt(key);
-        return objectToBigInteger(val, defaultValue);
+        try {
+            return objectToBigInteger(val, defaultValue);
+        } catch (JSONException jsonException) {
+            return defaultValue;
+        }
     }
 
     /**
@@ -1421,6 +1432,9 @@ static BigInteger objectToBigInteger(Object val, BigInteger defaultValue) {
              * that type cast support that may truncate the decimal.
              */
             final String valStr = val.toString();
+            if (valStr.length() > 1000) {
+                throw new JSONException("Value too long for BigInteger or BigDecimal");
+            }
             if(isDecimalNotation(valStr)) {
                 return new BigDecimal(valStr).toBigInteger();
             }
@@ -2700,7 +2714,9 @@ public static Object stringToValue(String string) {
         char initial = string.charAt(0);
         if ((initial >= '0' && initial <= '9') || initial == '-') {
             try {
-                return stringToNumber(string);
+                if (string.length() <= 1000) {
+                    return stringToNumber(string);
+                }
             } catch (Exception ignore) {
                 // Do nothing
             }

src/main/java/org/json/XML.java

@@ -441,7 +441,7 @@ private static boolean parse(XMLTokener x, JSONObject context, String name, XMLP
                                         jsonObject.accumulate(config.getcDataTagName(),
                                                 config.isKeepStrings() ? ((String) token) : obj);
                                     } else {
-                                        jsonObject.accumulate(config.getcDataTagName(), stringToValue((String) token));
+                                        jsonObject.accumulate(config.getcDataTagName(), token);
                                     }
                                 }
                             }
@@ -650,7 +650,9 @@ public static Object stringToValue(String string) {
         char initial = string.charAt(0);
         if ((initial >= '0' && initial <= '9') || initial == '-') {
             try {
-                return stringToNumber(string);
+                if (string.length() <= 1000) {
+                    return stringToNumber(string);
+                }
             } catch (Exception ignore) {
             }
         }