aboutsummaryrefslogtreecommitdiff
path: root/libjava/testsuite
diff options
context:
space:
mode:
authorDavid Daney <ddaney@avtrex.com>2008-05-21 03:49:03 +0000
committerDavid Daney <daney@gcc.gnu.org>2008-05-21 03:49:03 +0000
commit32723ea0f97141dcc859af08906a52c7ddcc7278 (patch)
treee6e58a2d11b2eb0a13884ca5f7d7d4db1b0158ca /libjava/testsuite
parent57b6cfda36af9a9e0743b9599c766d559eb0304d (diff)
downloadgcc-32723ea0f97141dcc859af08906a52c7ddcc7278.zip
gcc-32723ea0f97141dcc859af08906a52c7ddcc7278.tar.gz
gcc-32723ea0f97141dcc859af08906a52c7ddcc7278.tar.bz2
re PR libgcj/36252 (OutOfMemoryError on simple text conversion.)
2008-05-20 David Daney <ddaney@avtrex.com> PR libgcj/36252 * java/lang/natString.ccn: Add #include <java/io/CharConversionException.h>. (init (byte[], int, int, String)): Catch and ignore CharConversionException. Break out of conversion loop on incomplete input. * testsuite/libjava.lang/PR36252.java: New test. * testsuite/libjava.lang/PR36252.out: New file, its expected output. * testsuite/libjava.lang/PR36252.jar: New file, its pre-compiled jar file. From-SVN: r135705
Diffstat (limited to 'libjava/testsuite')
-rw-r--r--libjava/testsuite/libjava.lang/PR36252.jarbin0 -> 959 bytes
-rw-r--r--libjava/testsuite/libjava.lang/PR36252.java16
-rw-r--r--libjava/testsuite/libjava.lang/PR36252.out1
3 files changed, 17 insertions, 0 deletions
diff --git a/libjava/testsuite/libjava.lang/PR36252.jar b/libjava/testsuite/libjava.lang/PR36252.jar
new file mode 100644
index 0000000..2c0d2c0
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/PR36252.jar
Binary files differ
diff --git a/libjava/testsuite/libjava.lang/PR36252.java b/libjava/testsuite/libjava.lang/PR36252.java
new file mode 100644
index 0000000..4f39a67
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/PR36252.java
@@ -0,0 +1,16 @@
+import java.io.UnsupportedEncodingException;
+
+public class PR36252
+{
+ public static void main(String[] args)
+ {
+ try {
+ byte[] txt = new byte[] {-55, 87, -55, -42, -55, -20};
+ // This new String(...) should not throw an OutOfMemoryError.
+ String s = new String(txt, 0, 6, "MS932");
+ } catch (UnsupportedEncodingException e) {
+ // Silently ignore.
+ }
+ System.out.println("ok");
+ }
+}
diff --git a/libjava/testsuite/libjava.lang/PR36252.out b/libjava/testsuite/libjava.lang/PR36252.out
new file mode 100644
index 0000000..9766475
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/PR36252.out
@@ -0,0 +1 @@
+ok