[CODEC-77] Base64 bug with empty input (new byte[0])

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

Author: garydgregory

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

@@ -443,7 +443,7 @@ void encode(byte[] in, int inPos, int inAvail) {
                     }
                     break;
             }
-            if (lineLength > 0) {
+            if (lineLength > 0 && pos > 0) {
                 System.arraycopy(lineSeparator, 0, buf, pos, lineSeparator.length);
                 pos += lineSeparator.length;
             }

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

@@ -42,6 +42,18 @@ public Base64InputStreamTest(String name) {
         super(name);
     }
 
+    /**
+     * Test the Base64InputStream implementation against empty input.
+     *
+     * @throws Exception for some failure scenarios.
+     */    
+    public void testBase64EmptyInputStream() throws Exception {
+        byte[] emptyEncoded = new byte[0];
+        byte[] emptyDecoded = new byte[0];
+        testByteByByte(emptyEncoded, emptyDecoded, 76, CRLF);
+        testByChunk(emptyEncoded, emptyDecoded, 76, CRLF);
+    }
+
     /**
      * Test the Base64InputStream implementation.
      *

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

@@ -42,12 +42,24 @@ public Base64OutputStreamTest(String name) {
         super(name);
     }
 
+    /**
+     * Test the Base64OutputStream implementation against empty input.
+     *
+     * @throws Exception for some failure scenarios.
+     */
+    public void testBase64EmptyOutputStream() throws Exception {
+        byte[] emptyEncoded = new byte[0];
+        byte[] emptyDecoded = new byte[0];
+        testByteByByte(emptyEncoded, emptyDecoded, 76, CRLF);
+        testByChunk(emptyEncoded, emptyDecoded, 76, CRLF);
+    }    
+
     /**
      * Test the Base64OutputStream implementation
      *
      * @throws Exception for some failure scenarios.
      */
-    public void testBase64InputStreamByteByByte() throws Exception {
+    public void testBase64OutputStreamByteByByte() throws Exception {
         // Hello World test.
         byte[] encoded = "SGVsbG8gV29ybGQ=\r\n".getBytes("UTF-8");
         byte[] decoded = "Hello World".getBytes("UTF-8");
@@ -75,7 +87,7 @@ public void testBase64InputStreamByteByByte() throws Exception {
      *
      * @throws Exception for some failure scenarios.
      */
-    public void testBase64InputStreamByChunk() throws Exception {
+    public void testBase64OutputStreamByChunk() throws Exception {
         // Hello World test.
         byte[] encoded = "SGVsbG8gV29ybGQ=\r\n".getBytes("UTF-8");
         byte[] decoded = "Hello World".getBytes("UTF-8");

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

@@ -29,7 +29,7 @@
 import junit.framework.TestCase;
 
 /**
- * Testcases for Base64 class.
+ * Test cases for Base64 class.
  * 
  * @author Apache Software Foundation
  * @version $Id$
@@ -830,6 +830,19 @@ public void testUUID() throws DecoderException, UnsupportedEncodingException {
         }
     }
 
+    /**
+     * Test encode and decode of empty byte array.
+     */
+    public void testEmptyBase64() {
+        byte[] empty = new byte[0];
+        byte[] result = Base64.encodeBase64(empty);
+        assertEquals("empty base64 encode", 0, result.length);
+
+        empty = new byte[0];
+        result = Base64.decodeBase64(empty);        
+        assertEquals("empty base64 decode", 0, result.length);        
+    }
+
     // -------------------------------------------------------- Private Methods
 
     private String toString(byte[] data) {