提交 d389ef8a 编写于 作者: B bpatel

Merge

...@@ -105,9 +105,8 @@ readBytes(JNIEnv *env, jobject this, jbyteArray bytes, ...@@ -105,9 +105,8 @@ readBytes(JNIEnv *env, jobject this, jbyteArray bytes,
fd = GET_FD(this, fid); fd = GET_FD(this, fid);
if (fd == -1) { if (fd == -1) {
JNU_ThrowIOException(env, "Stream Closed"); JNU_ThrowIOException(env, "Stream Closed");
return -1; nread = -1;
} } else {
nread = IO_Read(fd, buf, len); nread = IO_Read(fd, buf, len);
if (nread > 0) { if (nread > 0) {
(*env)->SetByteArrayRegion(env, bytes, off, nread, (jbyte *)buf); (*env)->SetByteArrayRegion(env, bytes, off, nread, (jbyte *)buf);
...@@ -118,6 +117,7 @@ readBytes(JNIEnv *env, jobject this, jbyteArray bytes, ...@@ -118,6 +117,7 @@ readBytes(JNIEnv *env, jobject this, jbyteArray bytes,
} else { /* EOF */ } else { /* EOF */
nread = -1; nread = -1;
} }
}
if (buf != stackBuf) { if (buf != stackBuf) {
free(buf); free(buf);
......
/*
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6791458
* @summary Reading from closed input files leaks native memory
*/
import java.io.*;
public class MemoryLeak {
public static void main(String[] args) throws Throwable {
byte[] bytes = new byte[1 << 20];
String dir = System.getProperty("test.src", ".");
File testFile = new File(dir, "input.txt");
FileInputStream s = new FileInputStream(testFile);
s.close();
for (int i = 0; i < 10000; i++) {
try {
s.read(bytes);
throw new Error("expected IOException");
} catch (IOException _) {
/* OK */
} catch (OutOfMemoryError oome) {
System.out.printf("Got OutOfMemoryError, i=%d%n", i);
throw oome;
}
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册