memory leak in io_util.c

[Martin Buchholz]

This is a followup to our previous io_util.c fixing.

Alan, please file a bug:

Description:
	When a user reads from a closed FileInputStream or
	RandomAccessFile into a byte array (or a region thereof)
	larger than 8k, an internal native buffer created for the read
	is leaked.

io_util.c has been bugging me for years, so
please file another cleanup bug:

Description: Code cleanups in io_util.c

Here's the fix for the memory leak (Alan, please review)

# HG changeset patch
# User martin
# Date 1231382910 28800
# Node ID 8a60a49c60087170f6af565285b59eacb0cdb731
# Parent  ff572b4f1ca45416b053a5ef37dbf27361199909
6666666: Reading from closed input files leaks native memory
Reviewed-by: alanb
Contributed-by: jeremymanson at google.com

diff --git a/src/share/native/java/io/io_util.c
b/src/share/native/java/io/io_util.c
--- a/src/share/native/java/io/io_util.c
+++ b/src/share/native/java/io/io_util.c
@@ -90,6 +90,12 @@
         return -1;
     }

+    fd = GET_FD(this, fid);
+    if (fd == -1) {
+        JNU_ThrowIOException(env, "Stream Closed");
+        return -1;
+    }
+
     if (len == 0) {
         return 0;
     } else if (len > BUF_SIZE) {
@@ -100,12 +106,6 @@
         }
     } else {
         buf = stackBuf;
-    }
-
-    fd = GET_FD(this, fid);
-    if (fd == -1) {
-        JNU_ThrowIOException(env, "Stream Closed");
-        return -1;
     }

     nread = IO_Read(fd, buf, len);
diff --git a/test/java/io/readBytes/MemoryLeak.java
b/test/java/io/readBytes/MemoryLeak.java
new file mode 100644
--- /dev/null
+++ b/test/java/io/readBytes/MemoryLeak.java
@@ -0,0 +1,51 @@
+/*
+ * 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 6666666
+ * @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;
+            }
+        }
+    }
+}