[ros-diffs] [ekohl] 69941: [FASTFAT] Fail, if we try to overwrite an existing directory.

Author: ekohl
Date: Thu Nov 19 16:36:39 2015
New Revision: 69941

URL: http://svn.reactos.org/svn/reactos?rev=69941&view=rev
Log:
[FASTFAT]
Fail, if we try to overwrite an existing directory.

Modified:
    trunk/reactos/drivers/filesystems/fastfat/create.c

Modified: trunk/reactos/drivers/filesystems/fastfat/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/create.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/create.c	[iso-8859-1] Thu Nov 19 16:36:39
2015
@@ -353,6 +353,7 @@
     PUNICODE_STRING PathNameU,
     PFILE_OBJECT FileObject,
     ULONG RequestedDisposition,
+    ULONG RequestedOptions,
     PVFATFCB *ParentFcb)
 {
     PVFATFCB Fcb;
@@ -401,6 +402,16 @@
     {
         DPRINT ("Could not make a new FCB, status: %x\n", Status);
         return  Status;
+    }
+
+    /* Fail, if we try to overwrite an existing directory */
+    if ((!(RequestedOptions & FILE_DIRECTORY_FILE) && (*Fcb->Attributes
& FILE_ATTRIBUTE_DIRECTORY)) &&
+        (RequestedDisposition == FILE_OVERWRITE ||
+         RequestedDisposition == FILE_OVERWRITE_IF ||
+         RequestedDisposition == FILE_SUPERSEDE))
+    {
+        vfatReleaseFCB(DeviceExt, Fcb);
+        return STATUS_OBJECT_NAME_COLLISION;
     }
 
     if (Fcb->Flags & FCB_DELETE_PENDING)
@@ -580,8 +591,9 @@
     /* Try opening the file. */
     if (!OpenTargetDir)
     {
-        Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject,
RequestedDisposition, &ParentFcb);
-        if (Status == STATUS_ACCESS_DENIED)
+        Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject,
RequestedDisposition, RequestedOptions, &ParentFcb);
+        if (Status == STATUS_ACCESS_DENIED ||
+            Status == STATUS_OBJECT_NAME_COLLISION)
             return Status;
     }
     else