Mercurial > hg > openjdk > jdk6 > jdk

changeset 1817:fd8651a3b753

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8199547: Exception to Pattern Syntax Reviewed-by: rriggs
author igerasim
date Sat, 17 Mar 2018 14:14:23 -0700
parents 0babb64bcbaa
children 9583b6a8e412
files src/share/classes/java/util/regex/PatternSyntaxException.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/util/regex/PatternSyntaxException.java	Tue Jun 05 20:30:21 2018 -0700
+++ b/src/share/classes/java/util/regex/PatternSyntaxException.java	Sat Mar 17 14:14:23 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -112,7 +112,7 @@
         }
         sb.append(nl);
         sb.append(pattern);
-        if (index >= 0) {
+        if (index >= 0 && pattern != null && index < pattern.length()) {
             sb.append(nl);
             for (int i = 0; i < index; i++) sb.append(' ');
             sb.append('^');