/hg/release/icedtea7-forest-2.6/jaxp: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jan 19 21:47:22 UTC 2016
changeset 76ead37867a5 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=76ead37867a5
author: aefimov
date: Wed Sep 02 16:40:03 2015 +0300
8133962: More general limits
Reviewed-by: dfuchs, lancea, ahgross
changeset ab80a04a71a5 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=ab80a04a71a5
author: aefimov
date: Fri Sep 11 02:22:42 2015 +0300
8134861: XSLT: Extension func call cause exception if namespace URI contains partial package name
Reviewed-by: joehw
changeset 7c422316234f in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=7c422316234f
author: asaha
date: Wed Nov 25 00:13:23 2015 -0800
8143132: L10n resource file translation update
Summary: L10n resource file translation update
Reviewed-by: naoto
Contributed-by: li.jiang at oracle.com
changeset c029d7572a67 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=c029d7572a67
author: andrew
date: Mon Jan 18 00:07:40 2016 +0000
Added tag jdk7u95-b00 for changeset 7c422316234f
changeset bc6edb6c12a7 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=bc6edb6c12a7
author: andrew
date: Mon Jan 18 15:52:13 2016 +0000
Merge jdk7u95-b00
diffstat:
.hgtags | 47 ++++++++++
.jcheck/conf | 2 -
make/Makefile | 4 +-
src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java | 2 +-
src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java | 2 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java | 6 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java | 8 +-
src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java | 5 +-
src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java | 12 +-
src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java | 5 +-
src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java | 2 +-
src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java | 10 ++
src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java | 2 +-
src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java | 6 +-
src/com/sun/xml/internal/stream/Entity.java | 8 +-
16 files changed, 92 insertions(+), 31 deletions(-)
diffs (443 lines):
diff -r 41c6f1e54d42 -r bc6edb6c12a7 .hgtags
--- a/.hgtags Fri Nov 13 02:43:40 2015 +0000
+++ b/.hgtags Mon Jan 18 15:52:13 2016 +0000
@@ -50,6 +50,7 @@
feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73
ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74
555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75
+fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12
233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
@@ -63,6 +64,7 @@
81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86
8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87
d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88
+826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13
d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89
c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90
b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91
@@ -111,6 +113,7 @@
d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134
4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
+1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14
1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137
be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139
@@ -123,6 +126,7 @@
bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
+b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint
104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
@@ -141,6 +145,7 @@
0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12
d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13
0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
+7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint
0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02
604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03
551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04
@@ -157,6 +162,7 @@
7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10
3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11
b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12
+c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint
7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13
82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14
36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01
@@ -186,11 +192,15 @@
f4e80156296e43182a0fea5f54032d8c0fd0b41f jdk7u6-b10
5078a73b3448849f3328af5e0323b3e1b8d2d26c jdk7u6-b11
c378e596fb5b2ebeb60b89da7ad33f329d407e2d jdk7u6-b12
+15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b01
+15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b02
+15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b03
15b71daf5e69c169fcbd383c0251cfc99e558d8a jdk7u6-b13
da79c0fdf9a8b5403904e6ffdd8f5dc335d489d0 jdk7u6-b14
94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15
0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16
5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17
+445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint
1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18
3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19
4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20
@@ -258,12 +268,14 @@
1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07
427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08
366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09
+14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint
23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10
825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11
560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12
937bae61a48febcc948b7e10ae781c9077360241 jdk7u14-b13
7038ca4959e50a02f797e639daffe6b2b4065f86 jdk7u14-b14
aa6fb94c5e7bc645f478b6f60c5e6e06bebcc2bf jdk7u14-b15
+1d1e1fc3b88d2fda0c7da55ee3abb2b455e0d317 ppc-aix-port-b04
99c114990b191f32e72c6158072033aec5816aaf jdk7u15-b01
edbaa584f09a78d0ad3c73389faf20409a552e46 jdk7u15-b02
14a9b60a2086f4e2f6ec43bee3375042946f6510 jdk7u15-b30
@@ -382,6 +394,7 @@
4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18
a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30
3c34f244296e98d8ebb94973c752f3395612391a jdk7u45-b31
+d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
056494e83d15cd1c546d32a3b35bdb6f670b3876 jdk7u45-b33
b5a83862ed2ab9cc2de3719e38c72519481a4bbb jdk7u45-b34
7fda9b300e07738116b2b95b568229bdb4b31059 jdk7u45-b35
@@ -431,8 +444,11 @@
d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01
050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02
+74093b75ddd4fc2e578a3469d32b8bb2de3692d5 icedtea-2.5pre01
+d7085aad637fa90d027840c7f7066dba82b21667 icedtea-2.5pre02
359b79d99538d17eeb90927a1e4883fcec31661f jdk7u60-b03
7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u60-b04
+10314bfd5ba43a63f2f06353f3d219b877f5120f icedtea-2.6pre01
673ea3822e59de18ae5771de7a280c6ae435ef86 jdk7u60-b05
fd1cb0040a1d05086ca3bf32f10e1efd43f05116 jdk7u60-b06
cd7c8fa7a057e62e094cdde78dd632de54cedb8c jdk7u60-b07
@@ -442,7 +458,11 @@
e57490e0b99917ea8e1da1bb4d0c57fd5b7705f9 jdk7u60-b11
a9574b35f0af409fa1665aadd9b2997a0f9878dc jdk7u60-b12
92cf0b5c1c3e9b61d36671d8fb5070716e0f016b jdk7u60-b13
+a0138328f7db004859b30b9143ae61d598a21cf9 icedtea-2.6pre02
+33912ce9492d29c3faa5eb6787d5141f87ebb385 icedtea-2.6pre03
2814f43a6c73414dcb2b799e1a52d5b44688590d jdk7u60-b14
+c3178eab3782f4135ea21b060683d29bde3bbc7e icedtea-2.6pre04
+b9104a740dcd6ec07a868efd6f57dad3560e402c icedtea-2.6pre05
10eed57b66336660f71f7524f2283478bdf373dc jdk7u60-b15
fefd2d5c524b0be78876d9b98d926abda2828e79 jdk7u60-b16
ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b17
@@ -582,10 +602,27 @@
6abf26813c3bd6047d5425e41dbc9dd1fd51cc63 jdk7u79-b15
7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00
4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01
+614b7c12f276c52ebef06fb17c79cf0eadbcc774 icedtea-2.6pre07
+75513ef5e265955b432550ec73770b8404a4d36b icedtea-2.6pre06
+fbc3c0ab4c1d53059c32d330ca36cb33a3c04299 icedtea-2.6pre08
25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02
+f59ee51637102611d2ecce975da8f4271bdee85f icedtea-2.6pre09
+603009854864635cbfc36e95f39b6da4070f541a icedtea-2.6pre10
+79d217da0a7a03fb071e7f2e99fbd5fc7c38aed5 icedtea-2.6pre11
1853995499cef61fc16e0e4b840276223314669b jdk7u80-b03
+1edb9d1d6451a8e147d74e69021bc3f00622b8c6 icedtea-2.6pre12
+a2841c1a7f292ee7ba33121435b566d347b99ddb icedtea-2.6pre13
+35cfccb24a9c229f960169ec986beae2329b0688 icedtea-2.6pre14
+133c38a2d10fdb95e332ceefa4db8cf765c8b413 icedtea-2.6pre15
+a41b3447afd7011c7d08b5077549695687b70ea4 icedtea-2.6pre16
+54100657ce67cb5164cb0683ceb58ae60542fd79 icedtea-2.6pre17
3f6f053831796f654ad8fd77a6e4f99163742649 jdk7u80-b04
b93c3e02132fd13971aea6df3c5f6fcd4c3b1780 jdk7u80-b05
+8cc37ea6edf6a464d1ef01578df02da984d2c79f icedtea-2.6pre18
+0e0fc4440a3ba74f0df5df62da9306f353e1d574 icedtea-2.6pre19
+3bb57abb921fcc182015e3f87b796af29fce4b68 icedtea-2.6pre20
+522863522a4d0b82790915d674ea37ef3b39c2a7 icedtea-2.6pre21
+8904cf73c0483d713996c71bf4496b748e014d2c icedtea-2.6pre22
d220098f4f327db250263b6c2b460fecec19331a jdk7u80-b06
535bdb640a91a8562b96799cefe9de94724ed761 jdk7u80-b07
3999f9baa3f0a28f82c6a7a073ad2f7a8e12866d jdk7u80-b08
@@ -598,9 +635,19 @@
1b435d2f2050ac43a7f89aadd0fdaa9bf0441e3d jdk7u80-b30
acfe75cb9d7a723fbaae0bf7e1b0fb3429df4ff8 jdk7u80-b15
b45dfccc8773ad062c128f63fa8073b0645f7848 jdk7u80-b32
+9150a16a7b801124e13a4f4b1260badecd96729a icedtea-2.6pre23
+e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6pre24
+e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6.0
b50728249c16d97369f0ed3e9d45302eae3943e4 jdk7u85-b00
e9190eeef373a9d2313829a9561e32cb722d68a9 jdk7u85-b01
+e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6-branchpoint
+ffbe529eeac7aa3b4cedd78be2f843c2f00f603c icedtea-2.6.1
d42101f9c06eebe7722c38d84d5ef228c0280089 jdk7u85-b02
+a5f1374a47150e3cdda1cc9a8775417ceaa62657 icedtea-2.6.2pre01
+4e264c1f6b2f335e0068608e9ec4c312cddde7a4 icedtea-2.6.2pre02
e95e9042c8f31c5fe3149afdbe114592a3e32e91 jdk7u91-b00
9f5bcd95c8d54f8cf5ab922b0b9e94f7ea6cdeb8 jdk7u91-b01
+f1202fb276950491aa1ed30e214351d235c94920 icedtea-2.6.2
6d9a192976332443bb3be46d49d5b255d9781fe9 jdk7u91-b02
+f7bf82fcbd098bc520ceb92f97890ee6f7da3506 icedtea-2.6.3
+7c422316234f10b327fdbc181aedd5e74f31fd38 jdk7u95-b00
diff -r 41c6f1e54d42 -r bc6edb6c12a7 .jcheck/conf
--- a/.jcheck/conf Fri Nov 13 02:43:40 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 41c6f1e54d42 -r bc6edb6c12a7 make/Makefile
--- a/make/Makefile Fri Nov 13 02:43:40 2015 +0000
+++ b/make/Makefile Mon Jan 18 15:52:13 2016 +0000
@@ -118,13 +118,13 @@
ifdef ALT_LANGTOOLS_DIST
ifdef ALT_BOOTDIR
ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
- ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
+ ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) -Djava.home=$(ALT_BOOTDIR)
endif
ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
else
ifdef ALT_JDK_IMPORT_PATH
ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
- ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
+ ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) -Djava.home=$(ALT_JDK_IMPORT_PATH)
endif
endif
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java Mon Jan 18 15:52:13 2016 +0000
@@ -1362,7 +1362,7 @@
{ "optionE", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"},
{ "optionV", " [-E (Entit\u00E4tsreferenzen nicht einblenden)]"},
{ "optionQC", " [-QC (Stille Musterkonfliktwarnungen)]"},
- { "optionQ", " [-Q (Stiller Modus)]"},
+ { "optionQ", " [-Q (Silent-Modus)]"},
{ "optionLF", " [-LF (Nur Zeilenvorsch\u00FCbe bei Ausgabe verwenden {Standard ist CR/LF})]"},
{ "optionCR", " [-CR (Nur Zeilenschaltungen bei Ausgabe verwenden {Standard ist CR/LF})]"},
{ "optionESCAPE", " [-ESCAPE (Escapezeichen {Standard ist <>&\"'\r\n}]"},
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java Mon Jan 18 15:52:13 2016 +0000
@@ -1213,7 +1213,7 @@
"Le nom de fonction ne peut pas \u00EAtre NULL."},
{ ER_XPATH_RESOLVER_NEGATIVE_ARITY,
- "Le nombre d'arguments ne peut pas \u00EAtre n\u00E9gatif."},
+ "L'arit\u00E9 ne peut pas \u00EAtre n\u00E9gative."},
// Warnings...
{ WG_FOUND_CURLYBRACE,
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Mon Jan 18 15:52:13 2016 +0000
@@ -932,9 +932,9 @@
//Check if FSP and SM - only then proceed with loading
if (namespace != null && isSecureProcessing
&& isExtensionFunctionEnabled
- && (namespace.equals(JAVA_EXT_XALAN)
- || namespace.equals(JAVA_EXT_XSLTC)
- || namespace.equals(JAVA_EXT_XALAN_OLD)
+ && (namespace.startsWith(JAVA_EXT_XALAN)
+ || namespace.startsWith(JAVA_EXT_XSLTC)
+ || namespace.startsWith(JAVA_EXT_XALAN_OLD)
|| namespace.startsWith(XALAN_CLASSPACKAGE_NAMESPACE))) {
_clazz = getXSLTC().loadExternalFunction(_className);
} else {
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Mon Jan 18 15:52:13 2016 +0000
@@ -567,8 +567,12 @@
}
public NodeList makeNodeList(DTMAxisIterator iter) {
- // TODO: gather nodes from all DOMs ?
- return _main.makeNodeList(iter);
+ int index = iter.next();
+ if (index == DTM.NULL) {
+ return null;
+ }
+ iter.reset();
+ return _adapters[getDTMId(index)].makeNodeList(iter);
}
public String getLanguage(int node) {
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java Mon Jan 18 15:52:13 2016 +0000
@@ -332,7 +332,7 @@
new Object[]{entityName});
}
}
- fEntityManager.startEntity(false, entityName, true);
+ fEntityManager.startEntity(true, entityName, true);
}
}
}
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java Mon Jan 18 15:52:13 2016 +0000
@@ -905,7 +905,7 @@
}
int length = fCurrentEntity.position - offset;
fCurrentEntity.columnNumber += length - newlines;
- if (fCurrentEntity.reference) {
+ if (fCurrentEntity.isGE) {
checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length);
}
content.setValues(fCurrentEntity.ch, offset, length);
@@ -1052,6 +1052,9 @@
}
int length = fCurrentEntity.position - offset;
fCurrentEntity.columnNumber += length - newlines;
+ if (fCurrentEntity.isGE) {
+ checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length);
+ }
content.setValues(fCurrentEntity.ch, offset, length);
// return next character
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Mon Jan 18 15:52:13 2016 +0000
@@ -1105,7 +1105,7 @@
/**
* Starts a named entity.
*
- * @param reference flag to indicate whether the entity is an Entity Reference.
+ * @param isGE flag to indicate whether the entity is a General Entity
* @param entityName The name of the entity to start.
* @param literal True if this entity is started within a literal
* value.
@@ -1113,7 +1113,7 @@
* @throws IOException Thrown on i/o error.
* @throws XNIException Thrown by entity handler to signal an error.
*/
- public void startEntity(boolean reference, String entityName, boolean literal)
+ public void startEntity(boolean isGE, String entityName, boolean literal)
throws IOException, XNIException {
// was entity declared?
@@ -1237,7 +1237,7 @@
}
// start the entity
- startEntity(reference, entityName, xmlInputSource, literal, external);
+ startEntity(isGE, entityName, xmlInputSource, literal, external);
} // startEntity(String,boolean)
@@ -1286,7 +1286,7 @@
* This method can be used to insert an application defined XML
* entity stream into the parsing stream.
*
- * @param reference flag to indicate whether the entity is an Entity Reference.
+ * @param isGE flag to indicate whether the entity is a General Entity
* @param name The name of the entity.
* @param xmlInputSource The input source of the entity.
* @param literal True if this entity is started within a
@@ -1296,12 +1296,12 @@
* @throws IOException Thrown on i/o error.
* @throws XNIException Thrown by entity handler to signal an error.
*/
- public void startEntity(boolean reference, String name,
+ public void startEntity(boolean isGE, String name,
XMLInputSource xmlInputSource,
boolean literal, boolean isExternal)
throws IOException, XNIException {
- String encoding = setupCurrentEntity(reference, name, xmlInputSource, literal, isExternal);
+ String encoding = setupCurrentEntity(isGE, name, xmlInputSource, literal, isExternal);
//when entity expansion limit is set by the Application, we need to
//check for the entity expansion limit set by the parser, if number of entity
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Mon Jan 18 15:52:13 2016 +0000
@@ -1038,7 +1038,7 @@
}
int length = fCurrentEntity.position - offset;
fCurrentEntity.columnNumber += length - newlines;
- if (fCurrentEntity.reference) {
+ if (fCurrentEntity.isGE) {
checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length);
}
@@ -1215,6 +1215,9 @@
}
int length = fCurrentEntity.position - offset;
fCurrentEntity.columnNumber += length - newlines;
+ if (fCurrentEntity.isGE) {
+ checkLimit(Limit.TOTAL_ENTITY_SIZE_LIMIT, fCurrentEntity, offset, length);
+ }
content.setValues(fCurrentEntity.ch, offset, length);
// return next character
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Mon Jan 18 15:52:13 2016 +0000
@@ -947,7 +947,7 @@
new Object[]{entityName});
}
}
- fEntityManager.startEntity(false, entityName, true);
+ fEntityManager.startEntity(true, entityName, true);
}
}
}
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java
--- a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Mon Jan 18 15:52:13 2016 +0000
@@ -529,6 +529,16 @@
invalidByte(4, 4, b2);
}
+ // check if output buffer is large enough to hold 2 surrogate chars
+ if (out + 1 >= ch.length) {
+ fBuffer[0] = (byte)b0;
+ fBuffer[1] = (byte)b1;
+ fBuffer[2] = (byte)b2;
+ fBuffer[3] = (byte)b3;
+ fOffset = 4;
+ return out - offset;
+ }
+
// decode bytes into surrogate characters
int uuuuu = ((b0 << 2) & 0x001C) | ((b1 >> 4) & 0x0003);
if (uuuuu > 0x10) {
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Mon Jan 18 15:52:13 2016 +0000
@@ -2116,7 +2116,7 @@
*/
@Override
public String getTextContent() throws DOMException {
- return getNodeValue(); // overriden in some subclasses
+ return dtm.getStringValue(node).toString();
}
/**
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Mon Jan 18 15:52:13 2016 +0000
@@ -3145,11 +3145,7 @@
m_data.elementAt(-dataIndex+1));
}
}
- else if (DTM.ELEMENT_NODE == type)
- {
- return getStringValueX(nodeHandle);
- }
- else if (DTM.DOCUMENT_FRAGMENT_NODE == type
+ else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type
|| DTM.DOCUMENT_NODE == type)
{
return null;
diff -r 41c6f1e54d42 -r bc6edb6c12a7 src/com/sun/xml/internal/stream/Entity.java
--- a/src/com/sun/xml/internal/stream/Entity.java Fri Nov 13 02:43:40 2015 +0000
+++ b/src/com/sun/xml/internal/stream/Entity.java Mon Jan 18 15:52:13 2016 +0000
@@ -344,8 +344,8 @@
// to know that prolog is read
public boolean xmlDeclChunkRead = false;
- // flag to indicate whether the Entity is an Entity Reference
- public boolean reference = false;
+ // flag to indicate whether the Entity is a General Entity
+ public boolean isGE = false;
/** returns the name of the current encoding
* @return current encoding name
@@ -391,11 +391,11 @@
//
/** Constructs a scanned entity. */
- public ScannedEntity(boolean reference, String name,
+ public ScannedEntity(boolean isGE, String name,
XMLResourceIdentifier entityLocation,
InputStream stream, Reader reader,
String encoding, boolean literal, boolean mayReadChunks, boolean isExternal) {
- this.reference = reference;
+ this.isGE = isGE;
this.name = name ;
this.entityLocation = entityLocation;
this.stream = stream;
More information about the distro-pkg-dev
mailing list