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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135705 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 16 insertions, 0 deletions

diff --git a/libjava/testsuite/libjava.lang/PR36252.java b/libjava/testsuite/libjava.lang/PR36252.java
new file mode 100644
index 00000000000..4f39a678b1a
--- /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");
+  }
+}