Mercurial > hg > icedtea11
changeset 1691:14ca9d8578c5
2009-02-26 Omair Majid <omajid@redhat.com>
* patches/icedtea-xml-encodinginfo.patch: New file. Fix possible
StackOverflowError.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
* HACKING: Document the above.
(transplanted from ecbd78fe74dc42215b2d15baffbdb4ca4d137157)
| author | Omair Majid <omajid@redhat.com> |
|---|---|
| date | Thu, 26 Feb 2009 14:12:08 -0500 |
| parents | 08db37b7e84f (current diff) ecbd78fe74dc (diff) |
| children | 3621c5f48425 |
| files | ChangeLog HACKING Makefile.am |
| diffstat | 4 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 26 18:49:20 2009 +0000 +++ b/ChangeLog Thu Feb 26 14:12:08 2009 -0500 @@ -69,6 +69,13 @@ * patches/hotspot/original/icedtea-includedb.patch, * patches/icedtea-libraries.patch: Recreated. +2009-02-26 Omair Majid <omajid@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@redhat.com> * patches/openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp: New file.
--- a/HACKING Thu Feb 26 18:49:20 2009 +0000 +++ b/HACKING Thu Feb 26 14:12:08 2009 -0500 @@ -74,6 +74,7 @@ * icedtea-no-precompiled.patch: Don't use precompiled header files in hotspot. * icedtea-java2d-dasher.patch: Fix interpretation of dash array elements in BasicStroke (S6793344). * icedtea-includedb.patch: Add missing include files. (S6793825, mostly applied in b47) +* icedtea-xml-encodinginfo.patch: Fix possible StackOverflowError in EncodingInfo (PR295). The following patches are only applied to OpenJDK6 in IcedTea6:
--- a/Makefile.am Thu Feb 26 18:49:20 2009 +0000 +++ b/Makefile.am Thu Feb 26 14:12:08 2009 -0500 @@ -1859,6 +1859,7 @@ patches/icedtea-demo-swingapplet.patch \ patches/icedtea-java2d-dasher.patch \ patches/icedtea-jvmtiEnv.patch \ + patches/icedtea-xml-encodinginfo.patch \ $(DISTRIBUTION_PATCHES) if WITH_RHINO
--- /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; + +