[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: Base64 fixlet

[Kaffe CVS]

PatchSet 5605 
Date: 2005/02/24 11:48:43
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: Base64 fixlet

2005-02-24  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-02-24  Chris Burdess  <dog at gnu.org>

        * BASE64.java: Truncate encoded byte array.

Members: 
	ChangeLog:1.3650->1.3651 
	libraries/javalib/gnu/java/net/BASE64.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3650 kaffe/ChangeLog:1.3651
--- kaffe/ChangeLog:1.3650	Thu Feb 24 11:45:23 2005
+++ kaffe/ChangeLog	Thu Feb 24 11:48:43 2005
@@ -2,6 +2,14 @@
 
 	Resynced with GNU Classpath.
 
+	2005-02-24  Chris Burdess  <dog at gnu.org>
+
+        * BASE64.java: Truncate encoded byte array.
+
+2005-02-24  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-02-24  David Gilbert  <david.gilbert at object-refinery.com>
 
         * java/awt/font/TextAttribute.java: changed names to lower case;
Index: kaffe/libraries/javalib/gnu/java/net/BASE64.java
diff -u kaffe/libraries/javalib/gnu/java/net/BASE64.java:1.1 kaffe/libraries/javalib/gnu/java/net/BASE64.java:1.2
--- kaffe/libraries/javalib/gnu/java/net/BASE64.java:1.1	Fri Dec  3 17:44:36 2004
+++ kaffe/libraries/javalib/gnu/java/net/BASE64.java	Thu Feb 24 11:48:46 2005
@@ -1,5 +1,5 @@
 /* BASE.java --
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -108,6 +108,12 @@
             bt[ti++] = src[(b2 << 2 & 0x3c) + (b3 >>> 6 & 0x3)];
             bt[ti++] = src[b3 & 0x3f];
           }
+      }
+     if (ti < bt.length)
+      {
+	byte[] tmp = new byte[ti];
+	System.arraycopy(bt, 0, tmp, 0, ti);
+	bt = tmp;
       }
     /*while (ti < bt.length)
       {