diff options
| author | Kaloian Doganov <kaloian@doganov.org> | 2007-01-30 02:46:54 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-30 02:46:54 +0000 |
| commit | 2828987879a62a861500d4b1d5649575a07e0b78 (patch) | |
| tree | be299b5c175f292d9142efb49196be1f1cce28c2 | |
| parent | 7bef57a0bd1bec0837c6171ab9b16a86f57bc54c (diff) | |
| download | gcc-2828987879a62a861500d4b1d5649575a07e0b78.zip gcc-2828987879a62a861500d4b1d5649575a07e0b78.tar.gz gcc-2828987879a62a861500d4b1d5649575a07e0b78.tar.bz2 | |
re PR libgcj/30600 (gnu.gcj.convert.BytesToCharsetAdaptor calculates bad argument for java.nio.Buffer.limit(int))
2007-01-29 Kaloian Doganov <kaloian@doganov.org>
PR libgcj/30600:
* gnu/gcj/convert/BytesToCharsetAdaptor.java (read): Fix call to
'limit'.
From-SVN: r121329
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class | bin | 2167 -> 2162 bytes | |||
| -rw-r--r-- | libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 037b1bb..023e31a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2007-01-29 Kaloian Doganov <kaloian@doganov.org> + + PR libgcj/30600: + * gnu/gcj/convert/BytesToCharsetAdaptor.java (read): Fix call to + 'limit'. + 2007-01-29 Kyle Galloway <kgallowa@redhat.com> * include/java-interp.h: Added _Jv_Frame class and its two diff --git a/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class b/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class Binary files differindex 7efd0fe..bf4e201 100644 --- a/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class +++ b/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class diff --git a/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java b/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java index 78ba848..4b43d7b 100644 --- a/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java +++ b/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation +/* Copyright (C) 2005, 2007 Free Software Foundation This file is part of libgcj. @@ -71,7 +71,7 @@ public class BytesToCharsetAdaptor extends BytesToUnicode { if (inBuf == null || ! inBuf.hasArray() || inBuf.array() != inbuffer) inBuf = ByteBuffer.wrap(inbuffer); - inBuf.limit(inpos + inlength); + inBuf.limit(inlength); inBuf.position(inpos); CharBuffer outBuf = CharBuffer.wrap(outbuffer, outpos, count); |