From a6b5bd3b6bae362a975ac28a00c0b9fe01c3ebf8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 10 Nov 2002 22:23:53 +0000 Subject: natFileDescriptorWin32.cc (read): Handle case where count is 0. * java/io/natFileDescriptorWin32.cc (read): Handle case where count is 0. * java/io/natFileDescriptorPosix.cc (read): Handle case where count is 0. From-SVN: r58997 --- libjava/java/io/natFileDescriptorPosix.cc | 5 +++++ libjava/java/io/natFileDescriptorWin32.cc | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'libjava/java') diff --git a/libjava/java/io/natFileDescriptorPosix.cc b/libjava/java/io/natFileDescriptorPosix.cc index 9929c30..80e6bad 100644 --- a/libjava/java/io/natFileDescriptorPosix.cc +++ b/libjava/java/io/natFileDescriptorPosix.cc @@ -293,6 +293,11 @@ java::io::FileDescriptor::read (jbyteArray buffer, jint offset, jint count) jsize bsize = JvGetArrayLength (buffer); if (offset < 0 || count < 0 || offset + count > bsize) throw new java::lang::ArrayIndexOutOfBoundsException; + + // Must return 0 if an attempt is made to read 0 bytes. + if (count == 0) + return 0; + jbyte *bytes = elements (buffer) + offset; int r = ::read (fd, bytes, count); if (r == 0) diff --git a/libjava/java/io/natFileDescriptorWin32.cc b/libjava/java/io/natFileDescriptorWin32.cc index e004057..4b157f7 100644 --- a/libjava/java/io/natFileDescriptorWin32.cc +++ b/libjava/java/io/natFileDescriptorWin32.cc @@ -305,6 +305,10 @@ java::io::FileDescriptor::read(jbyteArray buffer, jint offset, jint count) if (offset < 0 || count < 0 || offset + count > bsize) throw new java::lang::ArrayIndexOutOfBoundsException; + // Must return 0 if an attempt is made to read 0 bytes. + if (count == 0) + return 0; + jbyte *bytes = elements (buffer) + offset; DWORD read; -- cgit v1.1