aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Burdess <dog@gnu.org>2005-04-18 19:32:02 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2005-04-18 19:32:02 +0000
commit16a5a05324570bed1c763f237963748b4e34c4ad (patch)
treed4fd9cf1f88226d33581bc84bc99b93223b6eae3
parent1c6dcd2527af61c2d3559a50537988c89224b7d0 (diff)
downloadgcc-16a5a05324570bed1c763f237963748b4e34c4ad.zip
gcc-16a5a05324570bed1c763f237963748b4e34c4ad.tar.gz
gcc-16a5a05324570bed1c763f237963748b4e34c4ad.tar.bz2
BASE64.java: Truncate encoded byte array.
2005-04-18 Chris Burdess <dog@gnu.org> * gnu/java/net/BASE64.java: Truncate encoded byte array. From-SVN: r98343
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/gnu/java/net/BASE64.java8
2 files changed, 11 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 937e1a2..e57e004 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-18 Chris Burdess <dog@gnu.org>
+
+ * gnu/java/net/BASE64.java: Truncate encoded byte array.
+
2005-04-18 Michael Koch <konqueror@gmx.de>
gnu/java/awt/EmbeddedWindowSupport.java,
diff --git a/libjava/gnu/java/net/BASE64.java b/libjava/gnu/java/net/BASE64.java
index e711bb6e..2b997e3 100644
--- a/libjava/gnu/java/net/BASE64.java
+++ b/libjava/gnu/java/net/BASE64.java
@@ -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.
@@ -109,6 +109,12 @@ public final class BASE64
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)
{
bt[ti++] = 0x3d;