Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Check if the handle is valid before closing it

Browse source 
- Remove (unused) TdiCloseDevice
 - Don't reference the Connection/Address File object twice (it is already referenced in TdiOpenDevice)

svn path=/trunk/; revision=42358
This commit is contained in:
Cameron Gutman 2009-08-03 03:41:34 +00:00
parent 7d6218e65b
commit aee54b26cf
4 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/drivers/network/afd/afd/bind.c
View file

@ -33,11 +33,6 @@ NTSTATUS WarmSocketForBind( PAFD_FCB FCB ) {
&FCB->AddressFile.Handle, &FCB->AddressFile.Handle,
&FCB->AddressFile.Object ); &FCB->AddressFile.Object );
if (NT_SUCCESS(Status))
{
ObReferenceObject(FCB->AddressFile.Object);
}
AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status));
return Status; return Status;

5
reactos/drivers/network/afd/afd/connect.c
View file

@ -29,11 +29,6 @@ NTSTATUS WarmSocketForConnection( PAFD_FCB FCB ) {
FCB->Connection.Object ); FCB->Connection.Object );
} }
if (NT_SUCCESS(Status))
{
ObReferenceObject(FCB->Connection.Object);
}
return Status; return Status;
} }

12
reactos/drivers/network/afd/afd/main.c
View file

@ -96,6 +96,8 @@ AfdCreateSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp,
FCB->DeviceExt = DeviceExt; FCB->DeviceExt = DeviceExt;
FCB->Recv.Size = DEFAULT_RECEIVE_WINDOW_SIZE; FCB->Recv.Size = DEFAULT_RECEIVE_WINDOW_SIZE;
FCB->Send.Size = DEFAULT_SEND_WINDOW_SIZE; FCB->Send.Size = DEFAULT_SEND_WINDOW_SIZE;
FCB->AddressFile.Handle = INVALID_HANDLE_VALUE;
FCB->Connection.Handle = INVALID_HANDLE_VALUE;
KeInitializeSpinLock( &FCB->SpinLock ); KeInitializeSpinLock( &FCB->SpinLock );
ExInitializeFastMutex( &FCB->Mutex ); ExInitializeFastMutex( &FCB->Mutex );
@ -222,15 +224,21 @@ VOID CleanupSocket( PAFD_FCB FCB ) {
FCB->RemoteAddress = NULL; FCB->RemoteAddress = NULL;
} }
if( FCB->Connection.Object ) { if( FCB->Connection.Object ) {
ZwClose(FCB->Connection.Handle);
ObDereferenceObject(FCB->Connection.Object); ObDereferenceObject(FCB->Connection.Object);
FCB->Connection.Object = NULL; FCB->Connection.Object = NULL;
} }
if( FCB->AddressFile.Object ) { if( FCB->AddressFile.Object ) {
ZwClose(FCB->AddressFile.Handle);
ObDereferenceObject(FCB->AddressFile.Object); ObDereferenceObject(FCB->AddressFile.Object);
FCB->AddressFile.Object = NULL; FCB->AddressFile.Object = NULL;
} }
if( FCB->AddressFile.Handle != INVALID_HANDLE_VALUE ) {
ZwClose(FCB->AddressFile.Handle);
FCB->AddressFile.Handle = INVALID_HANDLE_VALUE;
}
if( FCB->Connection.Handle != INVALID_HANDLE_VALUE ) {
ZwClose(FCB->Connection.Handle);
FCB->Connection.Handle = INVALID_HANDLE_VALUE;
}
SocketStateUnlock( FCB ); SocketStateUnlock( FCB );
} }

20
reactos/drivers/network/afd/afd/tdi.c
View file

@ -146,31 +146,13 @@ static NTSTATUS TdiOpenDevice(
} }
if (!NT_SUCCESS(Status)) { if (!NT_SUCCESS(Status)) {
*Handle = NULL; *Handle = INVALID_HANDLE_VALUE;
*Object = NULL; *Object = NULL;
} }
return Status; return Status;
} }
NTSTATUS TdiCloseDevice(
HANDLE Handle,
PFILE_OBJECT FileObject)
{
AFD_DbgPrint(MAX_TRACE, ("Called. Handle (0x%X) FileObject (0x%X)\n",
Handle, FileObject));
if (Handle)
ZwClose(Handle);
if (FileObject)
ObDereferenceObject(FileObject);
return STATUS_SUCCESS;
}
NTSTATUS TdiOpenAddressFile( NTSTATUS TdiOpenAddressFile(
PUNICODE_STRING DeviceName, PUNICODE_STRING DeviceName,
PTRANSPORT_ADDRESS Name, PTRANSPORT_ADDRESS Name,