From fab4e2601c8d4edd7d22ce1ffd762820c4e87e38 Mon Sep 17 00:00:00 2001 From: mkoch Date: Mon, 18 Apr 2005 19:32:02 +0000 Subject: [PATCH] 2005-04-18 Chris Burdess * gnu/java/net/BASE64.java: Truncate encoded byte array. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98343 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 4 ++++ libjava/gnu/java/net/BASE64.java | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) 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 + + * gnu/java/net/BASE64.java: Truncate encoded byte array. + 2005-04-18 Michael Koch gnu/java/awt/EmbeddedWindowSupport.java, diff --git a/libjava/gnu/java/net/BASE64.java b/libjava/gnu/java/net/BASE64.java index e711bb6..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; -- 2.7.4