/hg/icedtea6: user: Denis Lila <dlila at redhat.com>
dlila at icedtea.classpath.org
dlila at icedtea.classpath.org
Mon Dec 6 16:36:02 PST 2010
changeset ccb45c2618bd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ccb45c2618bd
author: Denis Lila <dlila at redhat.com>
date: Mon Dec 06 17:04:54 2010 -0500
user: Denis Lila <dlila at redhat.com> Fixed bug ids from previous
commit. added patches/openjdk/7003777-bad-html-entity-parse.patch
changed ChangeLog changed Makefile.am changed NEWS removed
patches/openjdk/647674-bad-html-entity-parse.patch
diffstat:
5 files changed, 91 insertions(+), 82 deletions(-)
ChangeLog | 9 ++
Makefile.am | 2
NEWS | 2
patches/openjdk/647674-bad-html-entity-parse.patch | 80 -------------------
patches/openjdk/7003777-bad-html-entity-parse.patch | 80 +++++++++++++++++++
diffs (208 lines):
diff -r aceb60a00782 -r ccb45c2618bd ChangeLog
--- a/ChangeLog Mon Dec 06 12:37:25 2010 -0500
+++ b/ChangeLog Mon Dec 06 17:04:54 2010 -0500
@@ -1,3 +1,12 @@ 2010-12-06 Denis Lila <dlila at redhat.com
+2010-12-06 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am:
+ Changed patch name.
+ * patches/openjdk/647674-bad-html-entity-parse.patch: Removed.
+ * patches/openjdk/7003777-bad-html-entity-parse.patch: A rename
+ of the removed patch.
+ * NEWS: updated with the correct patch names.
+
2010-12-06 Denis Lila <dlila at redhat.com>
* Makefile.am:
diff -r aceb60a00782 -r ccb45c2618bd Makefile.am
--- a/Makefile.am Mon Dec 06 12:37:25 2010 -0500
+++ b/Makefile.am Mon Dec 06 17:04:54 2010 -0500
@@ -305,7 +305,7 @@ ICEDTEA_PATCHES = \
patches/jtreg-T6638712-fix.patch \
patches/openjdk/7002666-eclipse_cdt_oops_crash.patch \
patches/jtreg-T6650759m-fix.patch \
- patches/openjdk/647674-bad-html-entity-parse.patch
+ patches/openjdk/7003777-bad-html-entity-parse.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r aceb60a00782 -r ccb45c2618bd NEWS
--- a/NEWS Mon Dec 06 12:37:25 2010 -0500
+++ b/NEWS Mon Dec 06 17:04:54 2010 -0500
@@ -49,7 +49,7 @@ New in release 1.10 (2010-XX-XX):
- S6967434, PR450, RH530642: Round joins/caps of scaled up lines have poor quality.
- S7002666: Eclipse CDT projects crash with compressed oops
* Bug fixes
- - RH647674: JTextPane produces incorrect content after parsing the html text
+ - S7003777, RH647674: JTextPane produces incorrect content after parsing the html text
New in release 1.9.2 (2010-11-24):
diff -r aceb60a00782 -r ccb45c2618bd patches/openjdk/647674-bad-html-entity-parse.patch
--- a/patches/openjdk/647674-bad-html-entity-parse.patch Mon Dec 06 12:37:25 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-diff -U5 -r --new-file openjdk.old/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java openjdk/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java
---- openjdk.old/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java 2010-11-30 16:41:02.011095918 -0500
-+++ openjdk/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java 2010-11-30 16:23:10.068090762 -0500
-@@ -966,10 +966,14 @@
- }
- } else if (!parseIdentifier(false)) {
- char data[] = {'&'};
- return data;
- }
-+ // We need this in case the entity does not exist. If it doesn't then
-+ // we only want to return "&identifier;" if the semicolon was actually
-+ // there. Otherwise we return "&identifier".
-+ boolean chWasSemicolon = false;
- switch (ch) {
- case '\n':
- ln++;
- ch = readCh();
- lfCount++;
-@@ -986,10 +990,11 @@
- }
- break;
-
- case ';':
- ch = readCh();
-+ chWasSemicolon = true;
- break;
- }
-
- String nm = getString(pos);
- Entity ent = dtd.getEntity(nm);
-@@ -1006,11 +1011,11 @@
- if (nm.length() == 0) {
- error("invalid.entref", nm);
- return new char[0];
- }
- /* given that there is not a match restore the entity reference */
-- String str = "&" + nm + ";";
-+ String str = "&" + nm + (chWasSemicolon ? ";" : "");
-
- char b[] = new char[str.length()];
- str.getChars(0, b.length, b, 0);
- return b;
- }
-diff -U5 -r --new-file openjdk.old/jdk/test/javax/swing/text/html/Test647674.java openjdk/jdk/test/javax/swing/text/html/Test647674.java
---- openjdk.old/jdk/test/javax/swing/text/html/Test647674.java 1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/jdk/test/javax/swing/text/html/Test647674.java 2010-11-30 16:16:13.419104648 -0500
-@@ -0,0 +1,33 @@
-+/*
-+ @test
-+ @bug 647674
-+ @summary html nonexistent entities not parsed properly when the ";" is missing.
-+ @author Denis Lila <dlila at redhat.com>, cnsturgeon2000 at yahoo.com
-+ @run main Test647674
-+ */
-+import javax.swing.JTextPane;
-+import javax.swing.text.BadLocationException;
-+
-+/**
-+ * Test647674.java
-+ *
-+ * Summary: Check that invalid html entities are parsed "properly".
-+ * (see code below for what that means).
-+ */
-+
-+public class Test647674 {
-+ public static void main(String[] args) throws BadLocationException {
-+ JTextPane pane = new JTextPane();
-+ pane.setContentType("text/html");
-+ String content = "&somenonvalidentity";
-+ pane.setText(content);
-+
-+ // The bug we're testing consisted of a ';' being inserted after the
-+ // entity during the parsing.
-+ String out = pane.getDocument().getText(0, pane.getDocument().getLength());
-+ if (out.charAt(out.length() - 1) == ';') {
-+ throw new RuntimeException("bad non existent html entity parse");
-+ }
-+ }
-+}
-+
diff -r aceb60a00782 -r ccb45c2618bd patches/openjdk/7003777-bad-html-entity-parse.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7003777-bad-html-entity-parse.patch Mon Dec 06 17:04:54 2010 -0500
@@ -0,0 +1,80 @@
+diff -U5 -r --new-file openjdk.old/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java openjdk/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java
+--- openjdk.old/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java 2010-11-30 16:41:02.011095918 -0500
++++ openjdk/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java 2010-11-30 16:23:10.068090762 -0500
+@@ -966,10 +966,14 @@
+ }
+ } else if (!parseIdentifier(false)) {
+ char data[] = {'&'};
+ return data;
+ }
++ // We need this in case the entity does not exist. If it doesn't then
++ // we only want to return "&identifier;" if the semicolon was actually
++ // there. Otherwise we return "&identifier".
++ boolean chWasSemicolon = false;
+ switch (ch) {
+ case '\n':
+ ln++;
+ ch = readCh();
+ lfCount++;
+@@ -986,10 +990,11 @@
+ }
+ break;
+
+ case ';':
+ ch = readCh();
++ chWasSemicolon = true;
+ break;
+ }
+
+ String nm = getString(pos);
+ Entity ent = dtd.getEntity(nm);
+@@ -1006,11 +1011,11 @@
+ if (nm.length() == 0) {
+ error("invalid.entref", nm);
+ return new char[0];
+ }
+ /* given that there is not a match restore the entity reference */
+- String str = "&" + nm + ";";
++ String str = "&" + nm + (chWasSemicolon ? ";" : "");
+
+ char b[] = new char[str.length()];
+ str.getChars(0, b.length, b, 0);
+ return b;
+ }
+diff -U5 -r --new-file openjdk.old/jdk/test/javax/swing/text/html/Test7003777.java openjdk/jdk/test/javax/swing/text/html/Test7003777.java
+--- openjdk.old/jdk/test/javax/swing/text/html/Test7003777.java 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/test/javax/swing/text/html/Test7003777.java 2010-11-30 16:16:13.419104648 -0500
+@@ -0,0 +1,33 @@
++/*
++ @test
++ @bug 7003777
++ @summary html nonexistent entities not parsed properly when the ";" is missing.
++ @author Denis Lila <dlila at redhat.com>, cnsturgeon2000 at yahoo.com
++ @run main Test7003777
++ */
++import javax.swing.JTextPane;
++import javax.swing.text.BadLocationException;
++
++/**
++ * Test7003777.java
++ *
++ * Summary: Check that invalid html entities are parsed "properly".
++ * (see code below for what that means).
++ */
++
++public class Test7003777 {
++ public static void main(String[] args) throws BadLocationException {
++ JTextPane pane = new JTextPane();
++ pane.setContentType("text/html");
++ String content = "&somenonvalidentity";
++ pane.setText(content);
++
++ // The bug we're testing consisted of a ';' being inserted after the
++ // entity during the parsing.
++ String out = pane.getDocument().getText(0, pane.getDocument().getLength());
++ if (out.charAt(out.length() - 1) == ';') {
++ throw new RuntimeException("bad non existent html entity parse");
++ }
++ }
++}
++
More information about the distro-pkg-dev
mailing list