--- a/jdk/src/java.base/share/classes/java/util/regex/Pattern.java	Fri Jul 14 10:42:46 2017 -0700
+++ b/jdk/src/java.base/share/classes/java/util/regex/Pattern.java	Sat Jul 15 14:01:49 2017 -0700
@@ -3887,9 +3887,13 @@
                     return next.match(matcher, i + 1, seq);
                 if (ch == 0x0D) {
                     i++;
-                    if (i < matcher.to && seq.charAt(i) == 0x0A &&
-                        next.match(matcher, i + 1, seq)) {
-                        return true;
+                    if (i < matcher.to) {
+                        if (seq.charAt(i) == 0x0A &&
+                            next.match(matcher, i + 1, seq)) {
+                            return true;
+                        }
+                    } else {
+                        matcher.hitEnd = true;
                     }
                     return next.match(matcher, i, seq);
                 }