aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsundar <none@none>2014-06-03 13:57:52 +0530
committersundar <none@none>2014-06-03 13:57:52 +0530
commit9632c562f98fcde891baffe603dd8f85a10e2e13 (patch)
tree0743f4028f71840755ec279ba50ccea16544ab9d
parent01f4856d53d38038f8f45523a6b1eb810d485b0c (diff)
downloadnashorn-9632c562f98fcde891baffe603dd8f85a10e2e13.tar.gz
8044612: StringIndexOutOfBoundException in NativeRegExp.appendReplacement
Reviewed-by: hannesw, lagergren
-rw-r--r--src/jdk/nashorn/internal/objects/NativeRegExp.java6
-rw-r--r--test/script/basic/JDK-8044612.js37
2 files changed, 43 insertions, 0 deletions
diff --git a/src/jdk/nashorn/internal/objects/NativeRegExp.java b/src/jdk/nashorn/internal/objects/NativeRegExp.java
index 89a9a828..34657d25 100644
--- a/src/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -731,6 +731,12 @@ public final class NativeRegExp extends ScriptObject {
if (nextChar == '$') {
// Skip past $
cursor++;
+ if (cursor == replacement.length()) {
+ // nothing after "$"
+ sb.append('$');
+ break;
+ }
+
nextChar = replacement.charAt(cursor);
final int firstDigit = nextChar - '0';
diff --git a/test/script/basic/JDK-8044612.js b/test/script/basic/JDK-8044612.js
new file mode 100644
index 00000000..6980cd1b
--- /dev/null
+++ b/test/script/basic/JDK-8044612.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2014, 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-8044612: StringIndexOutOfBoundException in NativeRegExp.appendReplacement
+ *
+ * @test
+ * @run
+ */
+
+if ("hello".replace("h", "$") != "$ello") {
+ fail("String.prototype.replace failed to handle '$' as replacement");
+}
+
+if ("hello".replace("o", "$x") != "hell$x") {
+ fail("String.prototype.replace failed to handle '$x' as replacement");
+}