# HG changeset patch
# User igerasim
# Date 1521321263 25200
# Node ID fd8651a3b75379d43379e6237be67816b7abf9db
# Parent  0babb64bcbaa2830ea01f21c6dc64643d278ddcc
8199547: Exception to Pattern Syntax
Reviewed-by: rriggs

diff -r 0babb64bcbaa -r fd8651a3b753 src/share/classes/java/util/regex/PatternSyntaxException.java
--- 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('^');