infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-06-09 03:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

7067045: replaceAll("\u20ac", "$"); causses java.lang.StringIndexOutOfBoundsExceptio

Browse Source 
Updated to throw IAE instead.

Reviewed-by: lancea
This commit is contained in:
Xueming Shen 2012-04-12 15:01:41 -07:00
parent d4817a1e4f
commit 1f4653910f
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/src/share/classes/java/util/regex/Matcher.java
View File

@ -759,16 +759,19 @@ public final class Matcher implements MatchResult {
char nextChar = replacement.charAt(cursor);
if (nextChar == '\\') {
cursor++;
if (cursor == replacement.length())
throw new IllegalArgumentException(
"character to be escaped is missing");
nextChar = replacement.charAt(cursor);
result.append(nextChar);
cursor++;
} else if (nextChar == '$') {
// Skip past $
cursor++;
// A StringIndexOutOfBoundsException is thrown if
// this "$" is the last character in replacement
// string in current implementation, a IAE might be
// more appropriate.
// Throw IAE if this "$" is the last character in replacement
if (cursor == replacement.length())
throw new IllegalArgumentException(
"Illegal group reference: group index is missing");
nextChar = replacement.charAt(cursor);
int refNum = -1;
if (nextChar == '{') {

12
jdk/test/java/util/regex/RegExTest.java
View File

@ -33,6 +33,7 @@
* 5013885 5003322 4988891 5098443 5110268 6173522 4829857 5027748 6376940
* 6358731 6178785 6284152 6231989 6497148 6486934 6233084 6504326 6635133
* 6350801 6676425 6878475 6919132 6931676 6948903 6990617 7014645 7039066
* 7067045
*/
import java.util.regex.*;
@ -852,6 +853,17 @@ public class RegExTest {
if (!result.equals(toSupplementaries("zzz\\t$\\$zzz")))
failCount++;
// IAE should be thrown if backslash or '$' is the last character
// in replacement string
try {
"\uac00".replaceAll("\uac00", "$");
"\uac00".replaceAll("\uac00", "\\");
failCount++;
} catch (IllegalArgumentException iie) {
} catch (Exception e) {
failCount++;
}
report("Literal replacement");
}