FilePermission.java (equals): Use correct index for last character of path.

	* java/io/FilePermission.java (equals): Use correct index for
	last character of path.

From-SVN: r70206

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d9c5b19db4e74e8ead2825f751742728ba9525eb..f3ab9636bda180038233eccf73c30a3c8bee41a3 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-06  Tom Tromey  <tromey@redhat.com>
+
+       * java/io/FilePermission.java (equals): Use correct index for
+       last character of path.
+
 2003-08-06  Alan Modra  <amodra@bigpond.net.au>
 
        * acinclude.m4 (LIBGCJ_CONFIGURE): Remove AC_CANONICAL_BUILD.

diff --git a/libjava/java/io/FilePermission.java b/libjava/java/io/FilePermission.java
index a86c7c9ff992aa9507363985fc27e649c91f8592..7d3e0af1c6c19c27ed721922698309c363ca45f1 100644 (file)
--- a/libjava/java/io/FilePermission.java
+++ b/libjava/java/io/FilePermission.java
@@ -144,9 +144,10 @@ public final class FilePermission extends Permission implements Serializable
     /* Compare names, taking into account if they refer to a
      * directory and one has a separator and the other does not.
      */
-    if(f1.charAt(f1.length()) == File.separatorChar) 
+    if(f1.length() > 0 && f1.charAt(f1.length() - 1) == File.separatorChar) 
       {
-        if(f2.charAt(f2.length()) == File.separatorChar) 
+        if(f2.length() > 0
+          && f2.charAt(f2.length() - 1) == File.separatorChar) 
           {
            if(!f2.equals(f1))
              return false;
@@ -159,7 +160,8 @@ public final class FilePermission extends Permission implements Serializable
       } 
     else 
       {
-        if(f2.charAt(f2.length()) == File.separatorChar) 
+        if(f2.length() > 0
+          && f2.charAt(f2.length() - 1) == File.separatorChar) 
           {
            if(!f1.equals(f2.substring(0,f2.length()-1)))
              return false;