Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/.hgtags	Sat Oct 24 16:18:51 2020 +0800
     1.2 +++ b/.hgtags	Sat Oct 24 16:43:56 2020 +0800
     1.3 @@ -1104,8 +1104,23 @@
     1.4  0b39fe441888452aa6a7aabef856c23e8cabf9ff jdk8u262-b03
     1.5  eef87c0da03ebb76368edb3195c1c5924edda265 jdk8u262-b04
     1.6  e2a7c53cfa4d3c689bb819cf7ed6bb766a62baa9 jdk8u262-b05
     1.7 +e2a7c53cfa4d3c689bb819cf7ed6bb766a62baa9 jdk8u272-b00
     1.8  f6630163b3a2b7a136db8b78049f78aa491aaf69 jdk8u262-b06
     1.9  e085d9bd4f6596c5633359d16d9bfc39ecfb1b72 jdk8u262-b07
    1.10  18103a6d9d495506b71068e6886d436f98bb165c jdk8u262-b08
    1.11  7348b67e1dd4786e9cd4c0472ca2802f36a2573f jdk8u262-b09
    1.12 +15fcd98e96ac6bd631816fc78c3fa271f164ca6c jdk8u262-b10
    1.13 +15fcd98e96ac6bd631816fc78c3fa271f164ca6c jdk8u262-ga
    1.14  178e41bd00c344f712a2f44a60b6da9ca3ca5955 mips-jdk8u262-b10
    1.15 +15fcd98e96ac6bd631816fc78c3fa271f164ca6c jdk8u265-b00
    1.16 +124d863b2b5d0496d3f626f3426652871c950909 jdk8u265-b01
    1.17 +124d863b2b5d0496d3f626f3426652871c950909 jdk8u265-ga
    1.18 +ab242949177cbfcd698b3c9792d308f32ebec67f jdk8u272-b01
    1.19 +cf78b728ecca3ddd206a7bdbd9deb74eca80cf40 jdk8u272-b02
    1.20 +1409bb48eea8631fffab1a9d2903cf9f68aeb124 jdk8u272-b03
    1.21 +d90c85ae0004869d8f6c980d20e44ff513ff743e jdk8u272-b04
    1.22 +5e0be06a9cf23ac7a73e056f23505dcc1639709f jdk8u272-b05
    1.23 +f819244537cf8958f82c1c3c1fd32bbd89e956db jdk8u272-b06
    1.24 +7ee1ab38e286ab80a05fdfbe15e9694ae55d9d7f jdk8u272-b07
    1.25 +7b821bf9d092a5ab6d8bbb63590cd45e86738170 jdk8u272-b08
    1.26 +384ba0e962c88a2d84bdb590847a6db91286c2fb jdk8u272-b09

     2.1 --- a/THIRD_PARTY_README	Sat Oct 24 16:18:51 2020 +0800
     2.2 +++ b/THIRD_PARTY_README	Sat Oct 24 16:43:56 2020 +0800
     2.3 @@ -2240,7 +2240,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to PC/SC Lite v1.8.24,
     2.8 +%% This notice is provided with respect to PC/SC Lite v1.8.26,
     2.9  which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -3028,8 +3028,7 @@
    2.13    Apache Commons Math 3.2
    2.14    Apache Derby 10.11.1.2
    2.15    Apache Jakarta BCEL 5.1 
    2.16 -  Apache Jakarta Regexp 1.4 
    2.17 -  Apache Santuario XML Security for Java 1.5.4
    2.18 +  Apache Santuario XML Security for Java 2.1.1
    2.19    Apache Xalan-Java 2.7.2
    2.20    Apache Xerces Java 2.10.0 
    2.21    Apache XML Resolver 1.1 
    2.22 @@ -3243,3 +3242,41 @@
    2.23  
    2.24  -------------------------------------------------------------------------------
    2.25  
    2.26 +%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
    2.27 +Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
    2.28 +
    2.29 +--- begin of LICENSE ---
    2.30 +
    2.31 +Copyright (c) OASIS Open 2016. All Rights Reserved.
    2.32 +
    2.33 +All capitalized terms in the following text have the meanings assigned to them
    2.34 +in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
    2.35 +full Policy may be found at the OASIS website:
    2.36 +[http://www.oasis-open.org/policies-guidelines/ipr]
    2.37 +
    2.38 +This document and translations of it may be copied and furnished to others, and
    2.39 +derivative works that comment on or otherwise explain it or assist in its
    2.40 +implementation may be prepared, copied, published, and distributed, in whole or
    2.41 +in part, without restriction of any kind, provided that the above copyright
    2.42 +notice and this section are included on all such copies and derivative works.
    2.43 +However, this document itself may not be modified in any way, including by
    2.44 +removing the copyright notice or references to OASIS, except as needed for the
    2.45 +purpose of developing any document or deliverable produced by an OASIS
    2.46 +Technical Committee (in which case the rules applicable to copyrights, as set
    2.47 +forth in the OASIS IPR Policy, must be followed) or as required to translate it
    2.48 +into languages other than English.
    2.49 +
    2.50 +The limited permissions granted above are perpetual and will not be revoked by
    2.51 +OASIS or its successors or assigns.
    2.52 +
    2.53 +This document and the information contained herein is provided on an "AS IS"
    2.54 +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
    2.55 +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
    2.56 +INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
    2.57 +FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
    2.58 +ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
    2.59 +OF THIS DOCUMENT OR ANY PART THEREOF.
    2.60 +
    2.61 +--- end of LICENSE ---
    2.62 +
    2.63 +-------------------------------------------------------------------------------

     3.1 --- a/src/jdk/nashorn/tools/Shell.java	Sat Oct 24 16:18:51 2020 +0800
     3.2 +++ b/src/jdk/nashorn/tools/Shell.java	Sat Oct 24 16:43:56 2020 +0800
     3.3 @@ -288,7 +288,7 @@
     3.4                  } catch (IOException ioe) {
     3.5                      // ignore
     3.6                  }
     3.7 -                if (l.startsWith("#!")) {
     3.8 +                if (l != null && l.startsWith("#!")) {
     3.9                      shebangFilePos = i;
    3.10                  }
    3.11                  // We're only checking the first non-option argument. If it's not a shebang file, we're in normal

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/test/script/nosecurity/JDK-8193137.js	Sat Oct 24 16:43:56 2020 +0800
     4.3 @@ -0,0 +1,62 @@
     4.4 +/*
     4.5 + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
     4.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.7 + *
     4.8 + * This code is free software; you can redistribute it and/or modify it
     4.9 + * under the terms of the GNU General Public License version 2 only, as
    4.10 + * published by the Free Software Foundation.  Oracle designates this
    4.11 + * particular file as subject to the "Classpath" exception as provided
    4.12 + * by Oracle in the LICENSE file that accompanied this code.
    4.13 + *
    4.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    4.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    4.17 + * version 2 for more details (a copy is included in the LICENSE file that
    4.18 + * accompanied this code).
    4.19 + *
    4.20 + * You should have received a copy of the GNU General Public License version
    4.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    4.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4.23 + *
    4.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4.25 + * or visit www.oracle.com if you need additional information or have any
    4.26 + * questions.
    4.27 + */
    4.28 +
    4.29 +/**
    4.30 + * JDK-8193137 : Nashorn crashes when given an empty script file.
    4.31 + *
    4.32 + * @test
    4.33 + * @option -scripting
    4.34 + * @run
    4.35 + */
    4.36 +
    4.37 +if (typeof fail != 'function') {
    4.38 +    fail = print;
    4.39 +}
    4.40 +
    4.41 +var System = java.lang.System;
    4.42 +var File = java.io.File;
    4.43 +var javahome = System.getProperty("java.home");
    4.44 +var nashornJar = new File(System.getProperty("nashorn.jar"));
    4.45 +if (! nashornJar.isAbsolute()) {
    4.46 +    nashornJar = new File(".", nashornJar);
    4.47 +}
    4.48 +
    4.49 +// we want to use nashorn.jar passed and not the one that comes with JRE
    4.50 +var jjsCmd = javahome + "/../bin/jjs";
    4.51 +jjsCmd = jjsCmd.toString().replace(/\//g, File.separator);
    4.52 +if (! new File(jjsCmd).isFile()) {
    4.53 +    jjsCmd = javahome + "/bin/jjs";
    4.54 +    jjsCmd = jjsCmd.toString().replace(/\//g, File.separator);
    4.55 +}
    4.56 +
    4.57 +$ENV.PWD=System.getProperty("user.dir")
    4.58 +
    4.59 +var emptyFile = new File($ENV.PWD+File.separator+"empty.js");
    4.60 +emptyFile.createNewFile();
    4.61 +emptyFile.deleteOnExit();
    4.62 +
    4.63 +$EXEC(jjsCmd + " empty.js");
    4.64 +if($ERR != "")
    4.65 +    fail("jjs fails with empty script file");