Mercurial > hg > icedtea8-forest > nashorn
changeset 2572:6c540cfd2593 jdk8u242-b01
Merge
author | andrew |
---|---|
date | Thu, 17 Oct 2019 13:49:11 +0100 |
parents | 09109e8d8cfd (current diff) 0e89f4ee1f28 (diff) |
children | 14651a7c9f04 49b31f261653 |
files | .hgtags |
diffstat | 4 files changed, 16 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Sep 12 15:23:06 2019 -0400 +++ b/.hgtags Thu Oct 17 13:49:11 2019 +0100 @@ -1046,3 +1046,8 @@ 41756665474f7bc4ffc591c23887678eb2490ea6 jdk8u232-b04 52afbdfa7852542f5aa3021336ed7b7069c42997 jdk8u232-b05 8a951fd037e245425bbfe061a426a2250096b1ea jdk8u242-b00 +d9dd9b7ce13f7b6ff0124c47106cadf5499e7554 jdk8u232-b06 +0f61e27241b57c8ed5cd9b4d0324ac0d3b0daf13 jdk8u232-b07 +9fc2e50a5c2f98fce148bbe35e43fc17395e3afc jdk8u232-b08 +fba077f48da23f914f13b11718464a547215b7f6 jdk8u232-b09 +fba077f48da23f914f13b11718464a547215b7f6 jdk8u232-ga
--- a/THIRD_PARTY_README Thu Sep 12 15:23:06 2019 -0400 +++ b/THIRD_PARTY_README Thu Oct 17 13:49:11 2019 +0100 @@ -2130,13 +2130,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, +%% This notice is provided with respect to PC/SC Lite v1.8.24, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- -Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com> -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> +Copyright (c) 1999-2003 David Corcoran <corcoran@linuxnet.com> +Copyright (c) 2001-2011 Ludovic Rousseau <ludovic.rousseau@free.fr> All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2148,15 +2148,10 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran <corcoran@linuxnet.com> - http://www.linuxnet.com (MUSCLE) -4. The name of the author may not be used to endorse or promote products +3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with +Changes to this license can be made only by the copyright author with explicit written consent. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--- a/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java Thu Sep 12 15:23:06 2019 -0400 +++ b/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java Thu Oct 17 13:49:11 2019 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2019, 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 @@ -82,6 +82,8 @@ } } catch (final PatternSyntaxException e2) { throwParserException("syntax", e2.getMessage()); + } catch (StackOverflowError e3) { + throw new RuntimeException(e3); } }
--- a/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java Thu Sep 12 15:23:06 2019 -0400 +++ b/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java Thu Oct 17 13:49:11 2019 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2019, 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 @@ -82,6 +82,8 @@ } } catch (final PatternSyntaxException | JOniException e2) { throwParserException("syntax", e2.getMessage()); + } catch (StackOverflowError e3) { + throw new RuntimeException(e3); } }