Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-14 18:38:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTFS]

Browse source 
While handling IRP_MN_QUERY_DIRECTORY, in case there is no $FILE_NAME attribute, dump file attributes & MFT ID.
This fixes ASSERT failure when browsing some Win7 volumes

svn path=/trunk/; revision=68290
This commit is contained in:
Pierre Schweitzer 2015-06-27 13:40:05 +00:00
parent a011fa9bc5
commit c1f1ff059c
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
reactos/drivers/filesystems/ntfs/dirctl.c
View file

@ -38,6 +38,7 @@
static NTSTATUS static NTSTATUS
NtfsGetNameInformation(PDEVICE_EXTENSION DeviceExt, NtfsGetNameInformation(PDEVICE_EXTENSION DeviceExt,
PFILE_RECORD_HEADER FileRecord, PFILE_RECORD_HEADER FileRecord,
ULONGLONG MFTIndex,
PFILE_NAMES_INFORMATION Info, PFILE_NAMES_INFORMATION Info,
ULONG BufferLength) ULONG BufferLength)
{ {
@ -47,7 +48,12 @@ NtfsGetNameInformation(PDEVICE_EXTENSION DeviceExt,
DPRINT("NtfsGetNameInformation() called\n"); DPRINT("NtfsGetNameInformation() called\n");
FileName = GetBestFileNameFromRecord(FileRecord); FileName = GetBestFileNameFromRecord(FileRecord);
ASSERT(FileName != NULL); if (FileName == NULL)
{
DPRINT1("No name information for file ID: %#I64x\n", MFTIndex);
NtfsDumpFileAttributes(FileRecord);
return STATUS_OBJECT_NAME_NOT_FOUND;
}
Length = FileName->NameLength * sizeof (WCHAR); Length = FileName->NameLength * sizeof (WCHAR);
if ((sizeof(FILE_NAMES_INFORMATION) + Length) > BufferLength) if ((sizeof(FILE_NAMES_INFORMATION) + Length) > BufferLength)
@ -76,7 +82,12 @@ NtfsGetDirectoryInformation(PDEVICE_EXTENSION DeviceExt,
DPRINT("NtfsGetDirectoryInformation() called\n"); DPRINT("NtfsGetDirectoryInformation() called\n");
FileName = GetBestFileNameFromRecord(FileRecord); FileName = GetBestFileNameFromRecord(FileRecord);
ASSERT(FileName != NULL); if (FileName == NULL)
{
DPRINT1("No name information for file ID: %#I64x\n", MFTIndex);
NtfsDumpFileAttributes(FileRecord);
return STATUS_OBJECT_NAME_NOT_FOUND;
}
StdInfo = GetStandardInformationFromRecord(FileRecord); StdInfo = GetStandardInformationFromRecord(FileRecord);
ASSERT(StdInfo != NULL); ASSERT(StdInfo != NULL);
@ -121,7 +132,12 @@ NtfsGetFullDirectoryInformation(PDEVICE_EXTENSION DeviceExt,
DPRINT("NtfsGetFullDirectoryInformation() called\n"); DPRINT("NtfsGetFullDirectoryInformation() called\n");
FileName = GetBestFileNameFromRecord(FileRecord); FileName = GetBestFileNameFromRecord(FileRecord);
ASSERT(FileName != NULL); if (FileName == NULL)
{
DPRINT1("No name information for file ID: %#I64x\n", MFTIndex);
NtfsDumpFileAttributes(FileRecord);
return STATUS_OBJECT_NAME_NOT_FOUND;
}
StdInfo = GetStandardInformationFromRecord(FileRecord); StdInfo = GetStandardInformationFromRecord(FileRecord);
ASSERT(StdInfo != NULL); ASSERT(StdInfo != NULL);
@ -167,7 +183,12 @@ NtfsGetBothDirectoryInformation(PDEVICE_EXTENSION DeviceExt,
DPRINT("NtfsGetBothDirectoryInformation() called\n"); DPRINT("NtfsGetBothDirectoryInformation() called\n");
FileName = GetBestFileNameFromRecord(FileRecord); FileName = GetBestFileNameFromRecord(FileRecord);
ASSERT(FileName != NULL); if (FileName == NULL)
{
DPRINT1("No name information for file ID: %#I64x\n", MFTIndex);
NtfsDumpFileAttributes(FileRecord);
return STATUS_OBJECT_NAME_NOT_FOUND;
}
ShortFileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); ShortFileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS);
StdInfo = GetStandardInformationFromRecord(FileRecord); StdInfo = GetStandardInformationFromRecord(FileRecord);
@ -332,6 +353,7 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext)
case FileNameInformation: case FileNameInformation:
Status = NtfsGetNameInformation(DeviceExtension, Status = NtfsGetNameInformation(DeviceExtension,
FileRecord, FileRecord,
MFTRecord,
(PFILE_NAMES_INFORMATION)Buffer, (PFILE_NAMES_INFORMATION)Buffer,
BufferLength); BufferLength);
break; break;