From 2231e344a29c80c6cc937ec83aef1eb4ab8a601b Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Fri, 4 Sep 2015 08:37:01 +0000 Subject: [PATCH] [FASTFAT] - Don't try to free an uninitialized pointer in VfatSetRenameInformation. CID 1250303 - Actually use the dynamically calculated HashTableSize. CID 1237119/1237120/1237121 svn path=/trunk/; revision=68986 --- reactos/drivers/filesystems/fastfat/finfo.c | 1 + reactos/drivers/filesystems/fastfat/fsctl.c | 1 - reactos/drivers/filesystems/fastfat/vfat.h | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/reactos/drivers/filesystems/fastfat/finfo.c b/reactos/drivers/filesystems/fastfat/finfo.c index 66d172f503f..8829a9a7dea 100644 --- a/reactos/drivers/filesystems/fastfat/finfo.c +++ b/reactos/drivers/filesystems/fastfat/finfo.c @@ -529,6 +529,7 @@ VfatSetRenameInformation( RootFCB = RootFileObject->FsContext; } + RtlInitEmptyUnicodeString(&NewName, NULL, 0); ParentFCB = NULL; if (TargetFileObject == NULL) diff --git a/reactos/drivers/filesystems/fastfat/fsctl.c b/reactos/drivers/filesystems/fastfat/fsctl.c index 6a5189269df..41d9a8db0a6 100644 --- a/reactos/drivers/filesystems/fastfat/fsctl.c +++ b/reactos/drivers/filesystems/fastfat/fsctl.c @@ -429,7 +429,6 @@ VfatMount( { HashTableSize = 65537; // 65536 = 64 * 1024; } - HashTableSize = FCB_HASH_TABLE_SIZE; DPRINT("VFAT: Recognized volume\n"); Status = IoCreateDevice(VfatGlobalData->DriverObject, ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, diff --git a/reactos/drivers/filesystems/fastfat/vfat.h b/reactos/drivers/filesystems/fastfat/vfat.h index 0fec5d3a182..20f13b92e59 100644 --- a/reactos/drivers/filesystems/fastfat/vfat.h +++ b/reactos/drivers/filesystems/fastfat/vfat.h @@ -264,8 +264,6 @@ typedef struct _HASHENTRY } HASHENTRY; -#define FCB_HASH_TABLE_SIZE 65536 - typedef struct DEVICE_EXTENSION *PDEVICE_EXTENSION; typedef NTSTATUS (*PGET_NEXT_CLUSTER)(PDEVICE_EXTENSION,ULONG,PULONG);