Mercurial > hg > release > icedtea6-1.8
view patches/icedtea-xjc.patch @ 2150:e11a3915d1cf
Apply 2011/06/07 security patches.
2011-05-23 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am: Add security patches.
* NEWS: List security patches.
* patches/icedtea-nio2.patch: Rerolled post-security
patching.
* patches/security/20110607/6213702.patch,
* patches/security/20110607/6618658.patch,
* patches/security/20110607/7012520.patch,
* patches/security/20110607/7013519.patch,
* patches/security/20110607/7013969.patch,
* patches/security/20110607/7013971.patch,
* patches/security/20110607/7016495.patch,
* patches/security/20110607/7020198.patch,
* patches/security/20110607/7020373.patch:
New security patches.
* patches/icedtea-xjc.patch: Rerolled after 7013971.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Tue, 24 May 2011 23:28:49 +0100 |
parents | 82e80f46cafe |
children | 7524f507af5c |
line wrap: on
line source
diff -Nru openjdk.orig/jaxws/build.properties openjdk/jaxws/build.properties --- openjdk.orig/jaxws/build.properties 2011-05-23 23:27:25.858844463 +0100 +++ openjdk/jaxws/build.properties 2011-05-23 23:28:12.143588051 +0100 @@ -78,7 +78,7 @@ patches.dir=patches # Patches to apply -jaxws_src.patch.list=7013971.patch +jaxws_src.patch.list=7013971.patch xjc.patch # Sanity information sanity.info= Sanity Settings:${line.separator}\ diff -Nru openjdk.orig/jaxws/patches/jaxws_src/xjc.patch openjdk/jaxws/patches/jaxws_src/xjc.patch --- openjdk.orig/jaxws/patches/jaxws_src/xjc.patch 1970-01-01 01:00:00.000000000 +0100 +++ openjdk/jaxws/patches/jaxws_src/xjc.patch 2011-05-23 23:28:02.719436649 +0100 @@ -0,0 +1,17 @@ +--- src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java.prev 2008-10-21 15:50:20.000000000 +0100 ++++ src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java 2008-10-21 15:57:37.000000000 +0100 +@@ -66,6 +66,14 @@ + + SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); + sf.setErrorHandler(errorFilter); ++ try { ++ // By default the SchemaFactory imposes a limit of 5000 on ++ // xsd:sequence maxOccurs if a SecurityManager is ++ // installed. This breaks the specification of xjc, ++ // causing TCK failures. ++ sf.setProperty("http://apache.org/xml/properties/security-manager", null); ++ } catch (SAXException e) { ++ } + if( entityResolver != null ) { + sf.setResourceResolver(new LSResourceResolver() { + public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {