From 782bcb9f987ec9168a7224260f90d072b4688b73 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Wed, 12 Jul 2006 15:25:50 +0000 Subject: [PATCH] File.java (renameTo): Fix security checks. 2006-07-12 Gary Benson * java/io/File.java (renameTo): Fix security checks. From-SVN: r115373 --- libjava/ChangeLog | 4 ++++ libjava/java/io/File.java | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 88ca1d86f47..dd3f0b787d4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2006-07-12 Gary Benson + + * java/io/File.java (renameTo): Fix security checks. + 2006-07-12 Bryce McKinlay PR libgcj/28352 diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index 55b7b08b931..8e2946ff4fd 100644 --- 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); }