changeset 58510:59035a7fab5d

8241291: JCK test javax_swing/text/DefaultStyledDocument/ElementSpec/ESpecCtor.html fails Reviewed-by: prr
author psadhukhan
date Sat, 21 Mar 2020 09:46:44 +0530
parents 20374b37dd01
children 44fa3757eba0
files src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java test/jdk/javax/swing/text/html/TestOOMWithLargePreTag.java
diffstat 2 files changed, 2 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java	Thu Mar 19 22:22:39 2020 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java	Sat Mar 21 09:46:44 2020 +0530
@@ -1264,8 +1264,8 @@
                                   int offs, int len) {
             attr = a;
             this.type = type;
-            this.data = txt == null ? null : Arrays.copyOfRange(txt, offs, offs+len);
-            this.offs = 0;
+            this.data = txt == null ? null : Arrays.copyOf(txt, txt.length);
+            this.offs = offs;
             this.len = len;
             this.direction = OriginateDirection;
         }
--- a/test/jdk/javax/swing/text/html/TestOOMWithLargePreTag.java	Thu Mar 19 22:22:39 2020 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8241078
- * @summary Tests OOM error parsing HTML with large <pre> Tag text
- * @run main/othervm -Xmx64M TestOOMWithLargePreTag
- */
-import java.io.StringReader;
-import javax.swing.text.html.HTMLEditorKit;
-
-public class TestOOMWithLargePreTag {
-    public static void main(String[] args) throws Exception {
-        StringBuilder html = new StringBuilder();
-        html.append("<html><body><pre>");
-        for (int i = 0; i < 10_000; i++) {
-            html.append("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
-                .append("\n");
-        }
-        html.append("</pre></body></html>");
-
-        HTMLEditorKit kit = new HTMLEditorKit();
-        kit.read(new StringReader(html.toString()), kit.createDefaultDocument(), 0);
-    }
-}