Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/objects/NativeRegExp.java	Fri May 30 17:22:38 2014 +0530
     1.2 +++ b/src/jdk/nashorn/internal/objects/NativeRegExp.java	Tue Jun 03 13:57:52 2014 +0530
     1.3 @@ -731,6 +731,12 @@
     1.4              if (nextChar == '$') {
     1.5                  // Skip past $
     1.6                  cursor++;
     1.7 +                if (cursor == replacement.length()) {
     1.8 +                    // nothing after "$"
     1.9 +                    sb.append('$');
    1.10 +                    break;
    1.11 +                }
    1.12 +
    1.13                  nextChar = replacement.charAt(cursor);
    1.14                  final int firstDigit = nextChar - '0';
    1.15  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8044612.js	Tue Jun 03 13:57:52 2014 +0530
     2.3 @@ -0,0 +1,37 @@
     2.4 +/*
     2.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8044612: StringIndexOutOfBoundException in NativeRegExp.appendReplacement
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +if ("hello".replace("h", "$") != "$ello") {
    2.35 +    fail("String.prototype.replace failed to handle '$' as replacement");
    2.36 +}
    2.37 +
    2.38 +if ("hello".replace("o", "$x") != "hell$x") {
    2.39 +    fail("String.prototype.replace failed to handle '$x' as replacement");
    2.40 +}