changeset in /hg/icedtea6: 2009-02-26 Omair Majid <omajid at redh...

[Omair Majid]

changeset ecbd78fe74dc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ecbd78fe74dc
description:
	2009-02-26  Omair Majid  <omajid at redhat.com>

	    * patches/icedtea-xml-encodinginfo.patch: New file. Fix possible
	    StackOverflowError.
	    * Makefile.am (ICEDTEA_PATCHES): Apply the above.
	    * HACKING: Document the above.

diffstat:

4 files changed, 28 insertions(+), 1 deletion(-)
ChangeLog                              |    7 +++++++
HACKING                                |    1 +
Makefile.am                            |    3 ++-
patches/icedtea-xml-encodinginfo.patch |   18 ++++++++++++++++++

diffs (60 lines):

diff -r 5bb8386e5bc2 -r ecbd78fe74dc ChangeLog
--- a/ChangeLog	Thu Feb 26 18:49:20 2009 +0000
+++ b/ChangeLog	Thu Feb 26 14:12:08 2009 -0500
@@ -1,3 +1,10 @@ 2009-02-26  Andrew Haley  <aph at redhat.co
+2009-02-26  Omair Majid  <omajid at redhat.com>
+
+	* patches/icedtea-xml-encodinginfo.patch: New file. Fix possible
+	StackOverflowError.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
+	* HACKING: Document the above.
+
 2009-02-26  Andrew Haley  <aph at redhat.com>
 
 	* patches/openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp: New file.
diff -r 5bb8386e5bc2 -r ecbd78fe74dc HACKING
--- a/HACKING	Thu Feb 26 18:49:20 2009 +0000
+++ b/HACKING	Thu Feb 26 14:12:08 2009 -0500
@@ -84,6 +84,7 @@ The following patches are currently appl
 * icedtea-awt-window-size.patch: Fix X11 window size calculation (S6721088).
 * icedtea-java2d-dasher.patch: Fix interpretation of dash array elements in BasicStroke (S6793344).
 * icedtea-cc-interp-backedge.patch: Remove some duplicated code in DO_BACKEDGE_CHECKS.
+* icedtea-xml-encodinginfo.patch: Fix possible StackOverflowError in EncodingInfo (PR295).
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r 5bb8386e5bc2 -r ecbd78fe74dc Makefile.am
--- a/Makefile.am	Thu Feb 26 18:49:20 2009 +0000
+++ b/Makefile.am	Thu Feb 26 14:12:08 2009 -0500
@@ -661,7 +661,8 @@ ICEDTEA_PATCHES += \
 	patches/icedtea-awt-window-size.patch \
 	patches/icedtea-java2d-dasher.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-format.patch \
-	patches/icedtea-cc-interp-backedge.patch
+	patches/icedtea-cc-interp-backedge.patch \
+	patches/icedtea-xml-encodinginfo.patch
 
 stamps/extract.stamp: stamps/download.stamp
 if OPENJDK_SRC_DIR_FOUND
diff -r 5bb8386e5bc2 -r ecbd78fe74dc patches/icedtea-xml-encodinginfo.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-xml-encodinginfo.patch	Thu Feb 26 14:12:08 2009 -0500
@@ -0,0 +1,18 @@
+--- EncodingInfo.java.orig	2009-02-19 14:46:50.000000000 -0500
++++ openjdk/jaxp/src/share/classes/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java	2009-02-20 10:31:37.000000000 -0500
+@@ -326,9 +326,11 @@
+             m_last = last;
+ 
+             // Set the range of unicode values that this object
+-            // explicitly manages
+-            m_explFirst = codePoint;
+-            m_explLast = codePoint + (RANGE-1);
++            // explicitly manages. Align the explicitly managed values
++            // to RANGE so multiple EncodingImpl objects dont manage the same 
++            // values.
++            m_explFirst = codePoint / RANGE * RANGE;
++            m_explLast = m_explFirst + (RANGE-1);
+ 
+             m_encoding = encoding;
+ 
+