/hg/icedtea8-forest/nashorn: 16 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jan 21 03:33:04 UTC 2020
changeset 49b31f261653 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=49b31f261653
author: andrew
date: Fri Nov 08 16:49:37 2019 +0000
Added tag jdk8u242-b01 for changeset 6c540cfd2593
changeset 2c0573615bbb in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=2c0573615bbb
author: andrew
date: Mon Nov 18 16:42:09 2019 +0000
Added tag jdk8u242-b02 for changeset 49b31f261653
changeset 61edd0c12ca0 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=61edd0c12ca0
author: andrew
date: Wed Nov 27 05:33:23 2019 +0000
Added tag jdk8u242-b03 for changeset 2c0573615bbb
changeset 51635f054bcb in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=51635f054bcb
author: hannesw
date: Fri Jun 08 11:11:06 2018 +0200
8204290: Add check to limit number of capture groups
Reviewed-by: sundar, jlaskey
changeset 319c1b31d551 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=319c1b31d551
author: hannesw
date: Fri Jun 08 11:08:38 2018 +0200
8204288: Matching the end of a string followed by an empty greedy regex and a word boundary fails
Reviewed-by: sundar, jlaskey
changeset 637547562431 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=637547562431
author: andrew
date: Wed Dec 04 16:23:50 2019 +0000
Merge
changeset 191f7b51899b in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=191f7b51899b
author: andrew
date: Wed Dec 04 16:24:17 2019 +0000
Added tag jdk8u242-b04 for changeset 637547562431
changeset 735e7a309c5b in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=735e7a309c5b
author: sgehwolf
date: Tue Dec 17 06:08:19 2019 +0000
8232984: Upgrading Joni License version to 2.1.16
Reviewed-by: andrew
changeset 0735b1dcec36 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=0735b1dcec36
author: andrew
date: Fri Dec 20 06:46:46 2019 +0000
Added tag jdk8u242-b05 for changeset 735e7a309c5b
changeset 1bccea33f6db in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=1bccea33f6db
author: andrew
date: Mon Jan 06 06:55:57 2020 +0000
Added tag jdk8u242-b06 for changeset 0735b1dcec36
changeset 0704986602a8 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=0704986602a8
author: andrew
date: Mon Jan 13 04:58:09 2020 +0000
Added tag jdk8u242-b07 for changeset 1bccea33f6db
changeset b297e93fc637 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=b297e93fc637
author: andrew
date: Wed Jan 15 20:08:26 2020 +0000
Added tag jdk8u242-b08 for changeset 0704986602a8
changeset ea4fa532fc41 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=ea4fa532fc41
author: andrew
date: Fri Jan 17 19:08:23 2020 +0000
Added tag jdk8u242-ga for changeset 0704986602a8
changeset 04210bbb67cd in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=04210bbb67cd
author: andrew
date: Mon Jan 20 01:17:05 2020 +0000
Merge jdk8u242-ga
changeset 45647b9db720 in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=45647b9db720
author: andrew
date: Tue Jan 21 03:11:19 2020 +0000
Added tag icedtea-3.15.0 for changeset 04210bbb67cd
changeset 86cfea5325ef in /hg/icedtea8-forest/nashorn
details: http://icedtea.classpath.org/hg/icedtea8-forest/nashorn?cmd=changeset;node=86cfea5325ef
author: andrew
date: Tue Jan 21 03:15:17 2020 +0000
Added tag icedtea-3.16.0pre00 for changeset 04210bbb67cd
diffstat:
.hgtags | 73 ++++++++++
.jcheck/conf | 2 -
THIRD_PARTY_README | 4 +-
src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java | 2 -
src/jdk/nashorn/internal/runtime/regexp/joni/Config.java | 1 +
src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java | 3 +
src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java | 1 +
test/script/basic/JDK-8204288.js | 35 ++++
test/script/basic/JDK-8204290.js | 40 +++++
9 files changed, 156 insertions(+), 5 deletions(-)
diffs (433 lines):
diff -r 6c540cfd2593 -r 86cfea5325ef .hgtags
--- a/.hgtags Thu Oct 17 13:49:11 2019 +0100
+++ b/.hgtags Tue Jan 21 03:15:17 2020 +0000
@@ -283,6 +283,7 @@
7e89db817ed094766a039762a8061c3a600c7284 jdk8u20-b07
2282c86cb1a954efd2fc5b7f22c173be19087c55 jdk8u20-b08
41f588adeb7a397d395233f00bd3402d0989934a jdk8u20-b09
+fdcdffd5b5b1eb7d442096433d17466f023207f1 icedtea-3.0.0pre01
fdcdffd5b5b1eb7d442096433d17466f023207f1 jdk8u20-b10
c116e9229e096ffe841f2b4f79067378288d0d1d jdk8u20-b11
c720454d2435be052fd941a789ece9468d1e8f74 jdk8u20-b12
@@ -296,6 +297,7 @@
ed3439dca4a73a2dd4a284f3457f0af216a3eb55 jdk8u20-b20
f2925491b61b22ac42f8c30ee9c6723ffa401a4c jdk8u20-b21
5332595fe7ba2a1fc5564cc2689f378b04a56eb4 jdk8u20-b22
+2a866ca13bc68da2a70f200002797b2bea432c68 icedtea-3.0.0pre02
ad36f9454ce38d78be39fc819902e1223765ee5e jdk8u20-b23
d3da140e179343011017669a6dbfcc52b0e56f52 jdk8u20-b24
d3da140e179343011017669a6dbfcc52b0e56f52 jdk8u20-b25
@@ -363,6 +365,9 @@
653739706172ae94e999731a3a9f10f8ce11ffca jdk8u40-b18
6ec61d2494283fbaca6df227f1a5b45487dc1ca7 jdk8u40-b19
4d240320929f7b2247eeb97e43efe2370b70582e jdk8u40-b20
+d8fc6574c0b2f294df84cc0b188b9140537e896b icedtea-3.0.0pre03
+bb36d4894aa49666805a0d08607a80cac3a0fffb icedtea-3.0.0pre04
+f78a539468973c9afb83cd38849fb13427d58ea2 icedtea-3.0.0pre05
dbb663a9d9aa2807ef501c7d20f29415816a1973 jdk8u40-b21
f9f70a0f60f48fbb95275b6c1110cedf740c6177 jdk8u40-b22
6ca090832d30fd0e46214ccc00816490ad75a8ab jdk8u40-b23
@@ -441,6 +446,9 @@
7475a2bd3c012f7dfd0532a344eb7efca56ac6e6 jdk8u60-b21
9ed906919b5d92067edcdd966a3f413fca0f70ab jdk8u60-b22
23165e806566f01cdc56421ea82c7e74a6fd85d5 jdk8u60-b23
+6f6d12f78ab05aa9ece89aeec09177ae088f33aa icedtea-3.0.0pre06
+fd478ce27023b3a4a7a9b64e65ce670c2b047542 icedtea-3.0.0pre07
+7babac6e7ecf625dc1f8f2c961c09ea9822ae90f icedtea-3.0.0pre08
68107693248469f7b4fdcc35c53e4206a0d55087 jdk8u60-b24
371f3f83f773ec97491d994bbcce834f0a2cca74 jdk8u60-b25
58791cd01bc9aa973d8845ce63403b90d357b5ac jdk8u60-b26
@@ -519,6 +527,7 @@
b779108a142b80d9d8503c7220ad3bb7cb0dda53 jdk8u72-b12
81e48503b62fd8814135f642905fe38056aaf2a9 jdk8u72-b13
e48d06eeff82bea512cea44fa14d59b88067ef83 jdk8u72-b14
+bbc1966c6af946256899d083521361ac41c57ace icedtea-3.0.0pre09
769b21d1b85cfb57c11c89bbc8f185f9e520df66 jdk8u72-b15
c90794ad4d12eeeae5d9bbfce65fa0043a313548 jdk8u72-b31
e9b46178f2e35d9ed2cd5b2f7279cf5e4e954222 jdk8u73-b00
@@ -551,6 +560,9 @@
7bce03d47545e6a5341a2722168cd6bf697c4132 jdk8u77-b00
678b645aa10aaf27895c87872c399c15daa026a1 jdk8u77-b01
09abd795d1d143933224bcb3f12f5d4686b65373 jdk8u77-b02
+82dc1533255a553c3269f6a2ec8242e3a1638d67 icedtea-3.0.0pre10
+697c5f792becf185ec29d7f60c3491f08800a109 icedtea-3.0.0
+38236e7925eb3b7929ae89e54ff96cb854d01fbb icedtea-3.0-branchpoint
b6ee21a35619ce4d3b46a9b825438a3bc9bb63cd jdk8u77-b03
a2c005a7b33abed886cfb4309a846dd80c87bd4e jdk8u91-b00
22925b345dffe4ba96fe2f429c4185cda1b30239 jdk8u91-b13
@@ -575,6 +587,10 @@
da1aa86606ef1b46655ae28d34e0d02604fb4cde jdk8u76-b12
256922f1e9e7648eb5af5a9da82ff8032b3855bc jdk8u92-b00
e2294411edbda51165bc1a10261c246cb4d3c5c5 jdk8u92-b13
+8dbea1d5ea71738dbdd28cd0537b2624ad389f56 icedtea-3.1.0pre01
+a69ff719fccb35948af9c950c414f6ccb16679cb icedtea-3.1.0pre02
+2417a5bf2b157c83863829b1773b9d4369f8a3b0 icedtea-3.1.0pre03
+68145b690b187b31cf2814d892d8779e17e3aa4d icedtea-3.1.0pre04
d2af8d0297223ff16d59ee64b7058cafef8f3bb8 jdk8u92-b14
ff47e8b14690edada1d0a4386e63bb4bc2f38ab4 jdk8u92-b31
895bb16c7f9fe0c74317afef671a0d5ccde58afa jdk8u92-b32
@@ -593,6 +609,8 @@
740d8d604c0ef2b12d9835d2842f60dcc08fee0d jdk8u101-b10
de5fdc537134ec505958a66d79c0ff68282520d2 jdk8u101-b11
2f506194a131597352bbe1a08492266a8aed13f8 jdk8u101-b12
+289b6e3c6e050f1a6f079c91a5f37c99889caed9 icedtea-3.1.0
+cd4ba667912c7cf2393bb290eb61528c55d96e72 icedtea-3.2.0pre01
44e4e6cbe15bf1674cfd7a03acfb962dd4339767 jdk8u101-b13
120c1b8b458170ed017d2ee60cc9d63896eeb4b9 jdk8u102-b00
120c1b8b458170ed017d2ee60cc9d63896eeb4b9 jdk8u82-b00
@@ -609,6 +627,8 @@
7bd6f4f266f66d32e4ce743928d7c4021c23c477 jdk8u102-b11
e3db6994bbbd654be3ebd677b2cc80469f7133a3 jdk8u102-b12
a010893ca6ee93c1a4832d1c484be6a119ca7ae4 jdk8u102-b13
+0b84d2cb4e3a247b2ca0f6a7f882892da3627329 icedtea-3.2.0pre02
+83a084be209bf907f8929ed2361a68427dcd8b89 icedtea-3.2.0pre03
0948e61a3722ea7519323dffcce4f26430fe2881 jdk8u102-b14
908d77c3a01687e99fb426cff41cf000f3f28e68 jdk8u102-b31
4510fa72a613e8bd8b02f7519362de60907ca652 jdk8u102-b32
@@ -629,6 +649,7 @@
c340ee5e5fd1d1a6ed57b3650ab46594dfccfc1d jdk8u111-b11
76bf7299d622029f1a579667611deeccc405e81a jdk8u111-b12
7ed1a5c5e45a1d576cc76dc96b3f0699bfe0a642 jdk8u111-b13
+0fb33c8b64d1d97095c668b81ad7a11e4c06e89f icedtea-3.2.0
97770cfdb942dce0a7c461175bce4fddac5ad339 jdk8u111-b14
1bf96637e4bbbc31f7c560c16d62ce2ed9020e03 jdk8u112-b00
be4ef6af7d3d67380d9df3348f75324ff6d8c971 jdk8u112-b01
@@ -646,6 +667,7 @@
b0aa9a71f5fbcb0d58fa009fd9bd3ea0897b315e jdk8u112-b14
adc75eca17418a42357776339b390533a94541d6 jdk8u112-b15
d1f2cab06d35f6b7ac29f5c3eebd74a74a01b8fb jdk8u112-b16
+b082c0d76be483cbaf0d40963b2d08cd171b0799 icedtea-3.3.0pre01
d4beac03b1230ff8c96af79dcd10c56bdc475ebb jdk8u112-b31
5cd9541c75fd68f8b575cb8499d9d375bee1033c jdk8u112-b32
ad155bea4b3c781cb7d421ac1164f68f3e6693d2 jdk8u112-b33
@@ -662,6 +684,9 @@
23970322bf063b36c0aefe103540618bb64a82af jdk8u121-b10
fe53d09bdd8f4309ce3f79e9dc4c512639de2610 jdk8u121-b11
89c0a71eeb4ae2011e7ed10f36e79b5184c7827b jdk8u121-b12
+c560422516c06dbce90f40a636046686a4fee896 icedtea-3.3.0pre02
+8c0fe384c4e7f0a085fe7f3dadb1764d6331be5f icedtea-3.3.0
+5f6a5f14b964923ca322ff2ae28e581c75c65c51 icedtea-3.4.0pre01
fd548ea7e156aba26836084b838df5e90b90b6ba jdk8u121-b13
32caa413708a573a2a5ae4b9c3995463afa9a935 jdk8u121-b31
3fb9ceaacc7c478172efcaa1e7aa301acb5a182c jdk8u121-b32
@@ -680,6 +705,8 @@
b6b8e309e75ac5e5750687d32d8d9024c9a97fa0 jdk8u131-b08
c82e269f57968a997f71f6be393fba2af8f77708 jdk8u131-b09
9fef324cda01dfd13b32d52036522530e5e4f449 jdk8u131-b10
+f2d9bca28d0eaffa0850f325f063e6939d95a5af icedtea-3.4.0
+ad209492df169f70d96b537d6b255a3748c7c671 icedtea-3.5.0pre01
dfd626733d62e3e705f4e746dd0917b7ebc4c601 jdk8u131-b11
cab15bc838dac12db221e0d4809bfbce10bfdb13 jdk8u131-b31
89914de2826daaf6dd554aa506237328b1347c93 jdk8u131-b32
@@ -700,8 +727,13 @@
31e8c2a1e8f7637d0f5e5b920b30536eee87d665 jdk8u141-b12
2c1a74bca789006be1cc7fc642048ade06fef2f2 jdk8u141-b13
8c329eab0dac3630854a56f2485f9862040bffdf jdk8u141-b14
+6743b468dda349f1e30f7b20c3cfd525ea3b3e82 icedtea-3.5.0
dfb2e076f381c4ea8c84ae0309a2072ec3ac92b8 jdk8u141-b15
6a52d202dfa3395d90cdd7dc24b8c437e5acc03d jdk8u144-b00
+bad6bd2d128ef39eb0916d4a5eb4e34a6ac2b5e6 icedtea-3.5.1
+6743b468dda349f1e30f7b20c3cfd525ea3b3e82 icedtea-3.6.0pre00
+bad6bd2d128ef39eb0916d4a5eb4e34a6ac2b5e6 icedtea-3.6.0pre01
+add478757898091bd33dae740baefdbb921cfe1e icedtea-3.6.0pre02
7de0a688b0d910d4ef2cb89da6623b3ded431276 jdk8u144-b01
6f50b0c7c275324f76cf7f09606949195fd65f92 jdk8u141-b31
59bf0950e077f66d1f6c5ef4a3f1489b2b2048fa jdk8u141-b32
@@ -723,6 +755,7 @@
34331f63b81e2a18c9241c762b9c92fd0bb8408e jdk8u151-b09
f41afee891a32a88224317737b1eecbd735e7fd7 jdk8u151-b10
a05eabdec5bb0133d6a8d0cf22f11c6e2a0d6b5d jdk8u151-b11
+a2d2fc80c97a5462a9978f240c43c006fa79e13d icedtea-3.6.0
dee0a16b2c50b99b0a232821861edc153f4f4937 jdk8u151-b12
18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00
9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01
@@ -750,6 +783,7 @@
293cf1e0a22791a96fe8e07f85af40f4dca64d1f jdk8u152-b13
6025f8527d42706d171201f0a912c760d4d0c037 jdk8u152-b14
a61136aa725ab8bb4721e8bb48aa827b49530978 jdk8u152-b15
+8c6bb035cdd2fc906d0fdca8ff24817295c227f1 icedtea-3.7.0pre01
d0841bfdb637d83ee0066df2f730b8a9b6fc3450 jdk8u152-b16
853acc70b8f5541cb6b7ecadebd441ab0c84745c jdk8u152-b31
94a17ba2690225347ccc3a07b9d15f42c5a20fa5 jdk8u152-b32
@@ -833,6 +867,9 @@
c2a2eec0d9ac38010bbf28b9445236c9cc6dc36f jdk8u161-b09
6c0d5e3aca6a666f639d593c47aa45f6c39da7c0 jdk8u161-b10
d4238183c6ba1559b415903436d46bdcc4abc9e2 jdk8u161-b11
+136ab780f038cf15c2397179d523f18eb54faaee icedtea-3.7.0
+136ab780f038cf15c2397179d523f18eb54faaee icedtea-3.8.0pre00
+55cbc2d00c93f82513ce33819d41dc67e71aaefd icedtea-4-branchpoint
d064facaf27ae0d2406a70d944684906ff66659f jdk8u161-b12
18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00
9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01
@@ -862,6 +899,7 @@
139ffc3c6fefe40f58ee300a0e56aeffb2b3469c jdk8u162-b09
67758d29ffbf0b68ddebe024cd877cdfd28622c2 jdk8u162-b10
0a93e6a9934e9e81e96b74e11402793026abfe55 jdk8u162-b11
+5afa6751113d5d33edb5086ca71e35b3f399a791 icedtea-3.8.0pre01
3f877d379c48178a1203089ea56b4e8061689b5d jdk8u162-b12
3c567ee8d853375cafa61378ab890bb4e82d98c2 jdk8u162-b31
59508dc01b26fa97854f4fed3ae466e3e3eb3a3e jdk8u162-b32
@@ -921,6 +959,10 @@
fd005fcf00fe65dad4b86508a5cd2ea5c627acd5 jdk8u171-b08
9d9a43a064fc3db9a65a41accf707fc43605955f jdk8u171-b09
e9b4feb9ed6ac7d8d620b162f8780f8470b21711 jdk8u171-b10
+2fd73cb3eef5cbc3e8772ff55be6f94dee752c78 icedtea-3.8.0pre02
+bb3e3345d3ecdcfbe54f42a5d8d540ea347e8298 icedtea-3.8.0
+bb3e3345d3ecdcfbe54f42a5d8d540ea347e8298 icedtea-3.9.0pre00
+c7849330a31f69bb8ae3c86b6ac2454f8e018bd7 icedtea-3.9.0pre01
921be31addf6c9fda681af76bec704780e5f2084 jdk8u171-b11
3ae3ebe2e2ee5648c38862179b2b1d1951ad97d7 jdk8u172-b00
8b311af3f1b260035ff12e86e324f8254b1d760b jdk8u172-b01
@@ -933,6 +975,7 @@
32ba142b2880976087c6da77cc32e58a5d0e8798 jdk8u172-b08
1353afc92267dd05157f752d698fba528924e1a2 jdk8u172-b09
3087d3a4983a9f280e6b29582486e81f020973f2 jdk8u172-b10
+0864fd4f2ada10744757e4cff797f22bad0f9de9 icedtea-3.9.0pre02
df6d51bc4491fd9fc6aacdb840d2d4d6a07efb03 jdk8u172-b11
1ade28deec4a0a92e4ee1d743fbd88594d2b033a jdk8u172-b31
228f8e1dceb069247fad31d08baf61d7a57236a8 jdk8u172-b32
@@ -953,6 +996,10 @@
1bd5edae0ad07f595e9f6f04e55cb8ce935df26e jdk8u181-b10
381f2224e3c3eadc2e3bfaf81d43be2d1f8078b9 jdk8u181-b11
6372ac5af37ae40a4875c6cdf5c28aeb2a701899 jdk8u181-b12
+b16226424c5acbe751bff260691b511b2783d508 jdk8u181-b31
+79a2c8e2babc233d4998ce07363e01bf3858cb3e icedtea-3.9.0
+79a2c8e2babc233d4998ce07363e01bf3858cb3e icedtea-3.10.0pre00
+568538a9f1d8409f99013b07599f2c9845e28dd6 icedtea-3.10.0pre01
3824009355133053ce6c714fff39d2e12dc67cde jdk8u181-b13
4706dc5f752c0e364413e62f19f905a543d602be jdk8u191-b01
9bae2c31c00bb6081026f7cb61aa50c726239a7a jdk8u201-b00
@@ -967,6 +1014,9 @@
0fcd632be9e7a67f17002adab0a9a03373f5c481 jdk8u191-b10
3388cb0fad9c8654cd6499835cbc190c8dbf2441 jdk8u191-b25
e6205ecef830a71d73a14d1f18765cf4c3ac7773 jdk8u191-b11
+6cf21321f3674c4806cd2c911255f976f024db0d icedtea-3.10.0
+6cf21321f3674c4806cd2c911255f976f024db0d icedtea-3.11.0pre00
+287a6c783833005c9db86b7a7dfc85b52bfc36e1 icedtea-3.11.0pre01
5a2c3b3dd9199561a1d4ba4a4b3bdfd7c6f69736 jdk8u191-b12
a53a027482b082dbecbdae9bb469fcd957d73900 jdk8u191-b26
5b549167a92971d6793079c702fa2fd79a987cbc jdk8u182-b00
@@ -984,6 +1034,7 @@
e58a7b05e786554d3447c3b04b11873314b549cd jdk8u192-b10
aa385e2ce23240f1466dbfcda5fd96ad325b109d jdk8u192-b25
9d6b5362a75ddef6ed30fe9892e95d7cfdff0ed8 jdk8u192-b11
+88ceae600dc83c6adc7cf6a062eb623c4e587163 icedtea-3.11.0pre02
854c8339d414bc20aa3c7603ad273aef5d668cde jdk8u192-b12
6aeb5e07e2bb8f64ee1d8f0651a2723f3a49e834 jdk8u192-b26
6c92477c026db1888e99c644e071d95609d9152d jdk8u181-b31
@@ -1005,6 +1056,7 @@
8bf098c9d21b1b407a4655bdf683b83474a211b4 jdk8u201-b07
38568172fbddb5177ff805ec1634da54c8ec2daa jdk8u201-b77
03dc179691c8b481cf97869cdb65047515ec5b11 jdk8u201-b08
+3cb2fe2b1b7d48f7c5350d58e6bbaf58bf54f3c8 icedtea-3.11.0
bf5c40b0e9d80c21a8aeecf73f0714b12a89f527 jdk8u201-b09
cd4430c469bf768cbb68c6b3e9b99d061cb35e5b jdk8u201-b79
5a876140bff867833dd33b7a610d9589803de894 jdk8u201-b25
@@ -1017,6 +1069,8 @@
05cd9eec8f9b5ae2011c586768c50ec0d20bb00b jdk8u202-b05
b16b59c5f123fa516e71d5636e582ae6a935e974 jdk8u202-b06
898989e3b02d0663a0a0386ce4f5397fe7867a79 jdk8u202-b07
+fcfed1a757720eafd559ec10a5c189d0cec19d4b icedtea-3.12.0pre01
+3cb2fe2b1b7d48f7c5350d58e6bbaf58bf54f3c8 icedtea-3.12.0pre00
7aeae6eb62362bd676ed9f809d8fa1c12295a843 jdk8u202-b08
7e3753cfb0766f2f404efad48758d6c0c6d493e9 jdk8u202-b25
513bdfdab61ccae75ceb3df1d5e656d32e65e1dc jdk8u202-b26
@@ -1028,6 +1082,7 @@
f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-b03
32c18a79003ad846811955f7348ea73061e91c40 jdk8u212-b04
f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-ga
+93462e8b4f4f5832465e9df92e65da73209f1458 icedtea-3.12.0
60065d9e17b0851add37f73c75189e98cdf22b35 jdk8u222-b01
4e370d5e4c5661d0ce075154afe52ae3514eb0ef jdk8u222-b02
e4becf2f38cea0539e7f12ba27e596e1d48e34b0 jdk8u222-b03
@@ -1040,7 +1095,11 @@
6e564bba54d07236fbe0b3e756aca5c7df38a952 jdk8u222-b09
0a5ba9e191cf8978fd3c66a53ea41b2bbdeec10b jdk8u222-b10
0a5ba9e191cf8978fd3c66a53ea41b2bbdeec10b jdk8u222-ga
+a4ff0302c55df1b30913000462e84f4eab09289c icedtea-3.13.0pre01
+69b1da223d933654595b0401b6970291434f6ec4 icedtea-3.13.0
3f4a6f52aac044b60e980e979a37333277e16646 jdk8u232-b01
+69b1da223d933654595b0401b6970291434f6ec4 icedtea-3.14.0pre00
+349bdbf4733bb02d3a78efcee06abc7f5af36afa icedtea-3.14.0pre01
908754951075417e36c730b6cbd5f4a3cf6ea611 jdk8u232-b02
7979e4a31f24adbcf19c9f8f23ac147be5dd4d12 jdk8u232-b03
41756665474f7bc4ffc591c23887678eb2490ea6 jdk8u232-b04
@@ -1051,3 +1110,17 @@
9fc2e50a5c2f98fce148bbe35e43fc17395e3afc jdk8u232-b08
fba077f48da23f914f13b11718464a547215b7f6 jdk8u232-b09
fba077f48da23f914f13b11718464a547215b7f6 jdk8u232-ga
+13722b4babad29727ee912da6da05cf99356b3dd icedtea-3.14.0
+13722b4babad29727ee912da6da05cf99356b3dd icedtea-3.15.0pre00
+14651a7c9f049812b67fc60c898726f7ccbd272d icedtea-3.15.0pre01
+6c540cfd25937bfddc5825a243a40a6615a9dddd jdk8u242-b01
+49b31f2616534d74144a4fa8480609e70dc56c06 jdk8u242-b02
+2c0573615bbb89bd2b522d0b4619ef513d3f51dd jdk8u242-b03
+6375475624314776773afbd023fabae34054cf52 jdk8u242-b04
+735e7a309c5b0623bf25b29a0a1e7e437d56a43c jdk8u242-b05
+0735b1dcec3677634ca632683ca14911431a236a jdk8u242-b06
+1bccea33f6dbb43bf0cb74b82bd9669aba5319ab jdk8u242-b07
+0704986602a8506f41e5a4648d724be74f1e6f95 jdk8u242-b08
+0704986602a8506f41e5a4648d724be74f1e6f95 jdk8u242-ga
+04210bbb67cdb97bb7ee8f699822fcce487dac5e icedtea-3.15.0
+04210bbb67cdb97bb7ee8f699822fcce487dac5e icedtea-3.16.0pre00
diff -r 6c540cfd2593 -r 86cfea5325ef .jcheck/conf
--- a/.jcheck/conf Thu Oct 17 13:49:11 2019 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup
diff -r 6c540cfd2593 -r 86cfea5325ef THIRD_PARTY_README
--- a/THIRD_PARTY_README Thu Oct 17 13:49:11 2019 +0100
+++ b/THIRD_PARTY_README Tue Jan 21 03:15:17 2020 +0000
@@ -1334,11 +1334,13 @@
--------------------------------------------------------------------------------
-%% This notice is provided with respect to Joni v1.1.9, which may be
+%% This notice is provided with respect to Joni v2.1.16, which may be
included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
+Copyright (c) 2017 JRuby Team
+
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
diff -r 6c540cfd2593 -r 86cfea5325ef src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java Thu Oct 17 13:49:11 2019 +0100
+++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java Tue Jan 21 03:15:17 2020 +0000
@@ -541,7 +541,6 @@
sprev = s;
s++;
}
- sprev = sbegin; // break;
}
private void opAnyCharMLStar() {
@@ -550,7 +549,6 @@
sprev = s;
s++;
}
- sprev = sbegin; // break;
}
private void opAnyCharStarPeekNext() {
diff -r 6c540cfd2593 -r 86cfea5325ef src/jdk/nashorn/internal/runtime/regexp/joni/Config.java
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java Thu Oct 17 13:49:11 2019 +0100
+++ b/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java Tue Jan 21 03:15:17 2020 +0000
@@ -45,6 +45,7 @@
final int NREGION = 10;
final int MAX_BACKREF_NUM = 1000;
+ final int MAX_CAPTURE_GROUP_NUM = 0x8000;
final int MAX_REPEAT_NUM = 100000;
final int MAX_MULTI_BYTE_RANGES_NUM = 10000;
diff -r 6c540cfd2593 -r 86cfea5325ef src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java Thu Oct 17 13:49:11 2019 +0100
+++ b/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java Tue Jan 21 03:15:17 2020 +0000
@@ -62,6 +62,9 @@
}
public int addMemEntry() {
+ if (numMem >= Config.MAX_CAPTURE_GROUP_NUM) {
+ throw new InternalException(ErrorMessages.ERR_TOO_MANY_CAPTURE_GROUPS);
+ }
if (numMem++ == 0) {
memNodes = new Node[SCANENV_MEMNODES_SIZE];
} else if (numMem >= memNodes.length) {
diff -r 6c540cfd2593 -r 86cfea5325ef src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
--- a/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java Thu Oct 17 13:49:11 2019 +0100
+++ b/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java Tue Jan 21 03:15:17 2020 +0000
@@ -31,6 +31,7 @@
final String ERR_PARSER_BUG = "internal parser error (bug)";
final String ERR_UNDEFINED_BYTECODE = "undefined bytecode (bug)";
final String ERR_UNEXPECTED_BYTECODE = "unexpected bytecode (bug)";
+ final String ERR_TOO_MANY_CAPTURE_GROUPS = "too many capture groups";
/* syntax error */
final String ERR_END_PATTERN_AT_LEFT_BRACE = "end pattern at left brace";
diff -r 6c540cfd2593 -r 86cfea5325ef test/script/basic/JDK-8204288.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8204288.js Tue Jan 21 03:15:17 2020 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8204288: Matching the end of a string followed by an empty greedy regex and a word boundary fails
+ *
+ * @test
+ * @run
+ */
+
+
+Assert.assertEquals(new RegExp("c.*\\b").exec("abc")[0], "c");
+Assert.assertEquals(new RegExp("abc.*\\b").exec("abc")[0], "abc");
+Assert.assertEquals(new RegExp("\\b.*abc.*\\b").exec("abc")[0], "abc");
+
diff -r 6c540cfd2593 -r 86cfea5325ef test/script/basic/JDK-8204290.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8204290.js Tue Jan 21 03:15:17 2020 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8204290: Add check to limit number of capture groups
+ *
+ * @test
+ * @run
+ */
+
+try {
+ var captureGroups = "";
+ for (i=0; i < 0x8001; i++) { captureGroups += "()"; }
+ new RegExp(captureGroups);
+ fail("Expected exception");
+} catch (e) {
+ Assert.assertTrue(e instanceof SyntaxError);
+ Assert.assertEquals(e.message, "too many capture groups");
+}
+
More information about the distro-pkg-dev
mailing list