File.java (renameTo): Fix security checks.

2006-07-12  Gary Benson  <gbenson@redhat.com>

	* java/io/File.java (renameTo): Fix security checks.

From-SVN: r115373

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 88ca1d86f47e29d16780be455dc891814a8a2d3f..dd3f0b787d41555e8c05cee4e3a6dfa632ffb32c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-12  Gary Benson  <gbenson@redhat.com>
+
+       * java/io/File.java (renameTo): Fix security checks.
+
 2006-07-12  Bryce McKinlay  <mckinlay@redhat.com>
 
        PR libgcj/28352

diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 55b7b08b9318e058d1fddc1b78f32aa83cc8a170..8e2946ff4fd6ead2360e1f4b242c7e36ac980af2 100644 (file)
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -1298,12 +1298,10 @@ public class File implements Serializable, Comparable
   public synchronized boolean renameTo(File dest)
   {
     SecurityManager s = System.getSecurityManager();
-    String sname = getName();
-    String dname = dest.getName();
     if (s != null)
       {
-       s.checkWrite (sname);
-       s.checkWrite (dname);
+       s.checkWrite (getPath());
+       s.checkWrite (dest.getPath());
       }
     return performRenameTo (dest);
   }