update Java version

Author: peteroupc

README.md

@@ -25,7 +25,7 @@ project, add the following to the `dependencies` section in your `pom.xml` file:
 <dependency>
   <groupId>com.upokecenter</groupId>
   <artifactId>cbor</artifactId>
-  <version>2.3.0</version>
+  <version>2.4.0</version>
 </dependency>
 ```
 
@@ -90,7 +90,7 @@ Source code is available in the [project page](https://github.com/peteroupc/CBOR
 About
 -----------
 
-Written in 2013-2014 by Peter O.
+Written in 2013-2016 by Peter O.
 
 Any copyright is dedicated to the Public Domain.
 [http://creativecommons.org/publicdomain/zero/1.0/](http://creativecommons.org/publicdomain/zero/1.0/)

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.upokecenter</groupId>
 	<artifactId>cbor</artifactId>
 	<packaging>jar</packaging>
-	<version>2.3.1</version>
+	<version>2.4.0</version>
 	<name>CBOR</name>
 	<description>
     A Java implementation of Concise Binary Object Representation (CBOR), a general-purpose binary data format defined in RFC 7049. According to that RFC, CBOR's data model "is an extended version of the JSON data model", supporting many more types of data than JSON. This implementation was written by Peter O. and is released to the Public Domain under the CC0 Declaration.

src/main/java/com/upokecenter/cbor/CBORInteger.java

@@ -114,6 +114,7 @@ public boolean IsNegative(Object obj) {
     public boolean IsNegativeInfinity(Object obj) {
       return false;
     }
+
     public boolean IsPositiveInfinity(Object obj) {
       return false;
     }

src/main/java/com/upokecenter/cbor/CBORJson.java

@@ -576,7 +576,7 @@ static void WriteJSONToInternal(
               return;
             }
             if (flo.isFinite() &&
-                (flo.getExponent()).Abs().compareTo(EInteger.FromInt64(2500)) > 0) {
+                flo.getExponent().Abs().compareTo(EInteger.FromInt64(2500)) > 0) {
               // Too inefficient to convert to a decimal number
               // from a bigfloat with a very high exponent,
               // so convert to double instead

src/main/java/com/upokecenter/cbor/CBORObject.java

@@ -312,7 +312,7 @@ public static CBORObject Divide(CBORObject a, CBORObject b) {
         EInteger bigrem;
         EInteger bigquo;
 {
-EInteger[] divrem = (b1).DivRem(b2);
+EInteger[] divrem = b1.DivRem(b2);
 bigquo = divrem[0];
 bigrem = divrem[1]; }
         return bigrem.isZero() ? CBORObject.FromObject(bigquo) :

src/main/java/com/upokecenter/cbor/CBORObjectMath.java

@@ -19,8 +19,8 @@ class CBORReader {
     private CBORDuplicatePolicy policy;
     private StringRefs stringRefs;
 
-    public CBORReader(InputStream stream) {
-      this.stream = stream;
+    public CBORReader(InputStream inStream) {
+      this.stream = inStream;
       this.sharedRefs = new SharedRefs();
       this.policy = CBORDuplicatePolicy.Overwrite;
     }
@@ -244,6 +244,11 @@ public CBORObject ReadForFirstByte(
                 " is bigger than supported");
             }
             if (nextByte != 0x60) {  // NOTE: 0x60 means the empty String
+              if (PropertyMap.ExceedsKnownLength(this.stream, len)) {
+                // TODO: Remove following line in version 3.0
+                PropertyMap.SkipStreamToEnd(this.stream);
+                throw new CBORException("Premature end of data");
+              }
               switch (
 DataUtilities.ReadUtf8(
 this.stream,
@@ -270,6 +275,11 @@ public CBORObject ReadForFirstByte(
               CBORUtilities.LongToString(uadditional) +
               " is bigger than supported");
           }
+          if (PropertyMap.ExceedsKnownLength(this.stream, uadditional)) {
+            // TODO: Remove following line in version 3.0
+            PropertyMap.SkipStreamToEnd(this.stream);
+            throw new CBORException("Premature end of data");
+          }
           StringBuilder builder = new StringBuilder();
           switch (
 DataUtilities.ReadUtf8(
@@ -336,6 +346,11 @@ public CBORObject ReadForFirstByte(
         if (filter != null && !filter.ArrayLengthMatches(uadditional)) {
           throw new CBORException("Array is too long");
         }
+        if (PropertyMap.ExceedsKnownLength(this.stream, uadditional)) {
+          // TODO: Remove following line in version 3.0
+          PropertyMap.SkipStreamToEnd(this.stream);
+          throw new CBORException("Remaining data too small for array length");
+        }
         ++this.depth;
         for (long i = 0; i < uadditional; ++i) {
           cbor.Add(
@@ -383,6 +398,11 @@ public CBORObject ReadForFirstByte(
             CBORUtilities.LongToString(uadditional) +
             " is bigger than supported");
         }
+        if (PropertyMap.ExceedsKnownLength(this.stream, uadditional)) {
+            // TODO: Remove following line in version 3.0
+            PropertyMap.SkipStreamToEnd(this.stream);
+            throw new CBORException("Remaining data too small for map length");
+        }
         for (long i = 0; i < uadditional; ++i) {
           ++this.depth;
           CBORObject key = this.Read(null);
@@ -508,6 +528,11 @@ private static byte[] ReadByteData(
         throw new CBORException("Length" + ToUnsignedBigInteger(uadditional) +
           " is bigger than supported ");
       }
+      if (PropertyMap.ExceedsKnownLength(stream, uadditional)) {
+        // TODO: Remove following line in version 3.0
+        PropertyMap.SkipStreamToEnd(stream);
+        throw new CBORException("Premature end of stream");
+      }
       if (uadditional <= 0x10000) {
         // Simple case: small size
         byte[] data = new byte[(int)uadditional];
@@ -535,7 +560,7 @@ private static byte[] ReadByteData(
         }
         java.io.ByteArrayOutputStream ms = null;
 try {
-ms = new java.io.ByteArrayOutputStream();
+ms = new java.io.ByteArrayOutputStream(0x10000);
 
           while (total > 0) {
             int bufsize = Math.min(tmpdata.length, total);

src/main/java/com/upokecenter/cbor/CBORReader.java

@@ -50,6 +50,7 @@ public final class CBORTypeFilter {
      */
     public static final CBORTypeFilter UnsignedInteger = new
       CBORTypeFilter().WithUnsignedInteger();
+
     private boolean any;
     private boolean anyArrayLength;
     private int arrayLength;
@@ -64,10 +65,11 @@ public final class CBORTypeFilter {
      * index is allowed under this type filter.
      * @param index An array index, starting from 0.
      * @return true if this type filter allows CBOR arrays and the given array
-     * index is allowed under this type filter, otherwise, false.
+     * index is allowed under this type filter; otherwise, false.
      */
     public boolean ArrayIndexAllowed(int index) {
-   return (this.types & (1 << 4)) != 0 && index >= 0 && (this.anyArrayLength||
+   return (this.types & (1 << 4)) != 0 && index >= 0 &&
+        (this.anyArrayLength ||
         ((this.arrayMinLength || index < this.arrayLength) && index >=
                     0));
     }

src/main/java/com/upokecenter/cbor/CBORTypeFilter.java

@@ -7,6 +7,7 @@
 at: http://peteroupc.github.io/CBOR/
  */
 
+import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Array;
@@ -171,6 +172,13 @@ private static Method getLegacyMethod(int method){
     }
   }
 
+    public static boolean ExceedsKnownLength(InputStream inStream, long size) {
+      return false;
+    }
+
+    public static void SkipStreamToEnd(InputStream inStream) {
+    }
+
     public static BigInteger ToLegacy(EInteger ei){
       return (BigInteger)InvokeOneArgumentMethod(
         getLegacyMethod(0), null, ei);

src/main/java/com/upokecenter/cbor/PropertyMap.java

@@ -41,7 +41,9 @@ public final class BigInteger implements Comparable<BigInteger> {
 @Deprecated
     public static final BigInteger ONE = new BigInteger(EInteger.FromInt32(1));
 
-    private static final BigInteger oneValue = new BigInteger(EInteger.FromInt32(1));
+    private static final BigInteger ValueOneValue = new
+      BigInteger(EInteger.FromInt32(1));
+
     private final EInteger ei;
 
     BigInteger(EInteger ei) {
@@ -54,6 +56,7 @@ public final class BigInteger implements Comparable<BigInteger> {
     static BigInteger ToLegacy(EInteger ei) {
       return new BigInteger(ei);
     }
+
     static EInteger FromLegacy(BigInteger bei) {
       return bei.getEi();
     }
@@ -73,12 +76,12 @@ static EInteger FromLegacy(BigInteger bei) {
     public static final BigInteger ZERO = new
       BigInteger(EInteger.FromInt32(0));
 
-  private static final BigInteger zeroValue = new
+  private static final BigInteger ValueZeroValue = new
       BigInteger(EInteger.FromInt32(0));
 
     /**
      * Gets a value indicating whether this value is even.
-     * @return True if this value is even; otherwise, false.
+     * @return true if this value is even; otherwise, false.
      * @deprecated Use EInteger from PeterO.Numbers/com.upokecenter.numbers.
  */
 @Deprecated
@@ -88,7 +91,7 @@ public final boolean isEven() {
 
     /**
      * Gets a value indicating whether this value is 0.
-     * @return True if this value is 0; otherwise, false.
+     * @return true if this value is 0; otherwise, false.
      * @deprecated Use EInteger from PeterO.Numbers/com.upokecenter.numbers.
  */
 @Deprecated
@@ -300,7 +303,7 @@ public int bitLength() {
 
     /**
      * Returns whether this object's value can fit in a 32-bit signed integer.
-     * @return True if this object's value is MinValue or greater, and MaxValue or
+     * @return true if this object's value is MinValue or greater, and MaxValue or
      * less; otherwise, false.
      * @deprecated Use EInteger from PeterO.Numbers/com.upokecenter.numbers.
  */
@@ -367,7 +370,7 @@ public BigInteger[] divideAndRemainder(BigInteger divisor) {
     /**
      * Determines whether this object and another object are equal.
      * @param obj An arbitrary object.
-     * @return True if this object and another object are equal; otherwise, false.
+     * @return true if this object and another object are equal; otherwise, false.
      */
   @Override public boolean equals(Object obj) {
       BigInteger bi = ((obj instanceof BigInteger) ? (BigInteger)obj : null);
@@ -419,7 +422,7 @@ public int getDigitCount() {
  */
 @Deprecated
   public int getLowBit() {
-      return (this.isZero()) ? (0) : (this.getEi().GetLowBit());
+      return this.isZero() ? 0 : this.getEi().GetLowBit();
  }
 
     /**
@@ -713,7 +716,7 @@ public BigInteger subtract(BigInteger subtrahend) {
      * object's value.
      * @param index Zero based index of the bit to test. 0 means the least
      * significant bit.
-     * @return True if a bit is set in the two's-complement representation of this
+     * @return true if a bit is set in the two's-complement representation of this
      * object's value; otherwise, false.
      * @deprecated Use EInteger from PeterO.Numbers/com.upokecenter.numbers.
  */