CODEC-112 Base64.encodeBase64(byte[] binaryData, boolean isChunked, boolean urlSafe, int maxResultSize) throws IAE for valid maxResultSize if isChunked is false

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1063922 13f79535-47bb-0310-9956-ffa450edef68

Author: sebbASF

src/java/org/apache/commons/codec/binary/Base64.java

@@ -824,7 +824,7 @@ public static byte[] encodeBase64(byte[] binaryData, boolean isChunked, boolean
             return binaryData;
         }
 
-        long len = getEncodeLength(binaryData, MIME_CHUNK_SIZE, CHUNK_SEPARATOR);
+        long len = getEncodeLength(binaryData, isChunked ? MIME_CHUNK_SIZE : 0, CHUNK_SEPARATOR);
         if (len > maxResultSize) {
             throw new IllegalArgumentException("Input array too big, the output array would be bigger (" +
                 len +

src/test/org/apache/commons/codec/binary/Base64Test.java

@@ -336,13 +336,19 @@ public void testEncodeOverMaxSize() throws Exception {
         testEncodeOverMaxSize(1);
         testEncodeOverMaxSize(2);
     }
+    
+    public void testCodec112() { // size calculation assumes always chunked
+        byte[] in = new byte[] {0};
+        byte[] out=Base64.encodeBase64(in);
+        Base64.encodeBase64(in, false, false, out.length);
+    }
 
     private void testEncodeOverMaxSize(int maxSize) throws Exception {
         try {
             Base64.encodeBase64(Base64TestData.DECODED, true, false, maxSize);
             fail("Expected " + IllegalArgumentException.class.getName());
         } catch (IllegalArgumentException e) {
-            // Expceted
+            // Expected
         }
     }