--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Sun Oct 05 10:23:13 2014 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java	Tue Oct 07 18:03:58 2014 +0400
@@ -1122,6 +1122,11 @@
                     Position.Bias b, int direction, Position.Bias[] biasRet)
                     throws BadLocationException{
         Document doc = editor.getDocument();
+
+        if (pos < -1 || pos > doc.getLength()) {
+            throw new BadLocationException("Invalid position", pos);
+        }
+
         if (doc instanceof AbstractDocument) {
             ((AbstractDocument)doc).readLock();
         }
@@ -1594,7 +1599,7 @@
                                              int direction,
                                              Position.Bias[] biasRet)
             throws BadLocationException {
-            if (pos < -1) {
+            if (pos < -1 || pos > getDocument().getLength()) {
                 throw new BadLocationException("invalid position", pos);
             }
             if( view != null ) {

--- a/jdk/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java	Sun Oct 05 10:23:13 2014 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java	Tue Oct 07 18:03:58 2014 +0400
@@ -854,7 +854,7 @@
                                          int direction,
                                          Position.Bias[] biasRet)
                                                   throws BadLocationException {
-        if (pos < -1) {
+        if (pos < -1 || pos > getDocument().getLength()) {
             throw new BadLocationException("invalid position", pos);
         }
         return Utilities.getNextVisualPositionFrom(

--- a/jdk/src/java.desktop/share/classes/javax/swing/text/CompositeView.java	Sun Oct 05 10:23:13 2014 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/CompositeView.java	Tue Oct 07 18:03:58 2014 +0400
@@ -463,7 +463,7 @@
     public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
                                          int direction, Position.Bias[] biasRet)
       throws BadLocationException {
-        if (pos < -1) {
+        if (pos < -1 || pos > getDocument().getLength()) {
             throw new BadLocationException("invalid position", pos);
         }
         Rectangle alloc = getInsideAllocation(a);
@@ -723,6 +723,9 @@
                                                       Shape a, int direction,
                                                       Position.Bias[] biasRet)
                                                 throws BadLocationException {
+        if (pos < -1 || pos > getDocument().getLength()) {
+            throw new BadLocationException("invalid position", pos);
+        }
         return Utilities.getNextVisualPositionFrom(
                             this, pos, b, a, direction, biasRet);
     }
@@ -754,6 +757,9 @@
                                                     int direction,
                                                     Position.Bias[] biasRet)
                                                 throws BadLocationException {
+        if (pos < -1 || pos > getDocument().getLength()) {
+            throw new BadLocationException("invalid position", pos);
+        }
         return Utilities.getNextVisualPositionFrom(
                             this, pos, b, a, direction, biasRet);
     }

--- a/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java	Sun Oct 05 10:23:13 2014 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java	Tue Oct 07 18:03:58 2014 +0400
@@ -900,7 +900,7 @@
                                          Position.Bias[] biasRet)
         throws BadLocationException {
 
-        if (pos < -1) {
+        if (pos < -1 || pos > getDocument().getLength()) {
             throw new BadLocationException("invalid position", pos);
         }
         return painter.getNextVisualPositionFrom(this, pos, b, a, direction, biasRet);

--- a/jdk/src/java.desktop/share/classes/javax/swing/text/View.java	Sun Oct 05 10:23:13 2014 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/View.java	Tue Oct 07 18:03:58 2014 +0400
@@ -500,7 +500,7 @@
     public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
                                          int direction, Position.Bias[] biasRet)
       throws BadLocationException {
-        if (pos < -1) {
+        if (pos < -1 || pos > getDocument().getLength()) {
             // -1 is a reserved value, see the code below
             throw new BadLocationException("Invalid position", pos);
         }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/text/NavigationFilter/8058305/bug8058305.java	Tue Oct 07 18:03:58 2014 +0400
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+import javax.swing.JFormattedTextField;
+import javax.swing.JFrame;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.NavigationFilter;
+import javax.swing.text.Position;
+
+/*
+ * @test
+ * @bug 8058305
+ * @summary BadLocationException is not thrown by
+ *   javax.swing.text.View.getNextVisualPositionFrom() for invalid positions
+ * @run main bug8058305
+ */
+public class bug8058305 {
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(bug8058305::createAndShowGUI);
+    }
+
+    private static void createAndShowGUI() {
+        JFrame frame = new JFrame();
+
+        JFormattedTextField textField = new JFormattedTextField();
+        NavigationFilter navigationFilter = new NavigationFilter();
+        textField.setText("Test for Tests");
+        frame.getContentPane().add(textField);
+        frame.pack();
+
+        Position.Bias[] biasRet = {Position.Bias.Forward};
+        try {
+            navigationFilter.getNextVisualPositionFrom(textField, 100,
+                    Position.Bias.Backward, SwingConstants.EAST, biasRet);
+            throw new RuntimeException("BadLocationException is not thrown!");
+        } catch (BadLocationException expectedException) {
+        }
+
+        frame.setVisible(true);
+
+        try {
+            navigationFilter.getNextVisualPositionFrom(textField, 200,
+                    Position.Bias.Forward, SwingConstants.WEST, biasRet);
+            throw new RuntimeException("BadLocationException is not thrown!");
+        } catch (BadLocationException expectedException) {
+        }
+    }
+}