Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-05 19:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed the deallocation of the irp on error after IoBuildSynchronousFsdRequest in NtRead/WriteFile.

Browse source 
There is no irp at this point. If the exception handler is hit, the irp isn't set.

svn path=/trunk/; revision=15192
This commit is contained in:
Hartmut Birr 2005-05-09 21:28:01 +00:00
parent 3c1ebc7084
commit 78fdef703c
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
reactos/ntoskrnl/io/file.c
View file

@ -2540,6 +2540,10 @@ NtReadFile(IN HANDLE FileHandle,
ByteOffset,
EventObject,
IoStatusBlock);
if (Irp == NULL)
{
Status = STATUS_INSUFFICIENT_RESOURCES;
}
}
_SEH_HANDLE
{
@ -2548,15 +2552,11 @@ NtReadFile(IN HANDLE FileHandle,
_SEH_END;
/* Cleanup if IRP Allocation Failed */
if (!NT_SUCCESS(Status) || !Irp)
if (!NT_SUCCESS(Status))
{
if (Event) ObDereferenceObject(EventObject);
ObDereferenceObject(FileObject);
if (Irp)
{
IoFreeIrp(Irp);
}
return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status;
return Status;
}
/* Set up IRP Data */
@ -3117,6 +3117,10 @@ NtWriteFile (IN HANDLE FileHandle,
ByteOffset,
EventObject,
IoStatusBlock);
if (Irp == NULL)
{
Status = STATUS_INSUFFICIENT_RESOURCES;
}
}
_SEH_HANDLE
{
@ -3125,15 +3129,14 @@ NtWriteFile (IN HANDLE FileHandle,
_SEH_END;
/* Cleanup on failure */
if (!NT_SUCCESS(Status) || !Irp)
if (!NT_SUCCESS(Status))
{
if (Event)
{
ObDereferenceObject(&EventObject);
}
ObDereferenceObject(FileObject);
if (Irp) IoFreeIrp(Irp);
return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status;
return Status;
}
/* Set up IRP Data */