Merge pull request #2528 from tom-tan/safe-file-setAttributes

Make std.file.setAttributes safe
dlang · Sep 18, 2014 · f88c252 · f88c252
2 parents 20d06a3 + 1a91e85
commit f88c252
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/std/file.d b/std/file.d
@@ -1091,16 +1091,24 @@ uint getLinkAttributes(in char[] name) @safe
     Throws:
         $(D FileException) if the given file does not exist.
  +/
-void setAttributes(in char[] name, uint attributes)
+void setAttributes(in char[] name, uint attributes) @safe
 {
     version (Windows)
     {
-        cenforce(SetFileAttributesW(name.tempCStringW(), attributes), name);
+        static auto trustedSetFileAttributesW(in char[] fileName, uint dwFileAttributes) @trusted
+        {
+            return SetFileAttributesW(fileName.tempCStringW(), dwFileAttributes);
+        }
+        cenforce(trustedSetFileAttributesW(name, attributes), name);
     }
     else version (Posix)
     {
+        static auto trustedChmod(in char[] path, mode_t mode) @trusted
+        {
+            return chmod(path.tempCString(), mode);
+        }
         assert(attributes <= mode_t.max);
-        cenforce(!chmod(name.tempCString(), cast(mode_t)attributes), name);
+        cenforce(!trustedChmod(name, cast(mode_t)attributes), name);
     }
 }