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

- Initially set PoolHandle, ConfigurationHandle, KeyHandle, and Filter to NULL

Browse source 
- Initially set PortOffset to 0
 - Fix 4 memory leaks
 - Remove a useless if

svn path=/branches/aicom-network-fixes/; revision=35848
This commit is contained in:
Cameron Gutman 2008-09-01 03:13:35 +00:00
parent 954aed91f2
commit 1443f6833b
5 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/network/ndis/ndis/buffer.c
View file

@ -488,6 +488,8 @@ NdisAllocatePacketPoolEx(
"NumberOfDescriptors (%d) ProtocolReservedLength (%d).\n",
Status, PoolHandle, NumberOfDescriptors, ProtocolReservedLength));
*PoolHandle = NULL;
if (NumberOfDescriptors > 0xffff)
{
*Status = NDIS_STATUS_RESOURCES;
@ -528,8 +530,9 @@ NdisAllocatePacketPoolEx(
*Status = NDIS_STATUS_SUCCESS;
*PoolHandle = (PNDIS_HANDLE)Pool;
} else
} else {
*Status = NDIS_STATUS_RESOURCES;
}
}
}

10
drivers/network/ndis/ndis/config.c
View file

@ -193,13 +193,14 @@ NdisOpenConfiguration(
NDIS_DbgPrint(MAX_TRACE, ("Called\n"));
*ConfigurationHandle = NULL;
*Status = ZwDuplicateObject(NtCurrentProcess(), RootKeyHandle,
NtCurrentProcess(), &KeyHandle, 0, 0,
DUPLICATE_SAME_ACCESS);
if(!NT_SUCCESS(*Status))
{
NDIS_DbgPrint(MID_TRACE, ("Failed to open registry configuration for this miniport\n"));
*ConfigurationHandle = NULL;
*Status = NDIS_STATUS_FAILURE;
return;
}
@ -743,7 +744,8 @@ NdisReadNetworkAddress(
if(!MiniportResource)
{
NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n"));
*Status = NDIS_STATUS_FAILURE;
ExFreePool(IntArray);
*Status = NDIS_STATUS_RESOURCES;
return;
}
@ -797,6 +799,8 @@ NdisOpenConfigurationKeyByIndex(
NDIS_HANDLE RegKeyHandle;
PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext;
*KeyHandle = NULL;
*Status = ZwEnumerateKey(ConfigurationHandle, Index, KeyBasicInformation, NULL, 0, &KeyInformationLength);
if(*Status != STATUS_BUFFER_TOO_SMALL && *Status != STATUS_BUFFER_OVERFLOW && *Status != STATUS_SUCCESS)
{
@ -885,6 +889,8 @@ NdisOpenConfigurationKeyByName(
OBJECT_ATTRIBUTES KeyAttributes;
NDIS_HANDLE RegKeyHandle;
*KeyHandle = NULL;
InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, 0);
*Status = ZwOpenKey(&RegKeyHandle, KEY_ALL_ACCESS, &KeyAttributes);

1
drivers/network/ndis/ndis/efilter.c
View file

@ -44,6 +44,7 @@ EthCreateFilter(
*Filter = (PETH_FILTER)NewFilter;
return TRUE;
}
*Filter = NULL;
return FALSE;
}

3
drivers/network/ndis/ndis/io.c
View file

@ -841,6 +841,8 @@ NdisMRegisterIoPortRange(
PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle;
ULONG AddressSpace = 1; /* FIXME The HAL handles this wrong atm */
*PortOffset = 0;
NDIS_DbgPrint(MAX_TRACE, ("Called - InitialPort 0x%x, NumberOfPorts 0x%x\n", InitialPort, NumberOfPorts));
memset(&PortAddress, 0, sizeof(PortAddress));
@ -878,7 +880,6 @@ NdisMRegisterIoPortRange(
NDIS_DbgPrint(MAX_TRACE, ("calling MmMapIoSpace\n"));
*PortOffset = 0;
*PortOffset = MmMapIoSpace(TranslatedAddress, NumberOfPorts, MmNonCached);
NDIS_DbgPrint(MAX_TRACE, ("Returning 0x%x for port range\n", *PortOffset));

10
drivers/network/ndis/ndis/miniport.c
View file

@ -562,13 +562,6 @@ MiniQueryInformation(
/* FIXME: Wait in pending case! */
/* XXX is status_pending part of success macro? */
if ((NT_SUCCESS(NdisStatus)) || (NdisStatus == NDIS_STATUS_PENDING))
{
NDIS_DbgPrint(DEBUG_MINIPORT, ("Miniport returned status (0x%X).\n", NdisStatus));
return NdisStatus;
}
return NdisStatus;
}
@ -1017,6 +1010,7 @@ NdisInitializeWrapper(
RegistryPath = ExAllocatePool(PagedPool, sizeof(UNICODE_STRING));
if(!RegistryPath)
{
ExFreePool(Miniport);
NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n"));
return;
}
@ -1028,6 +1022,8 @@ NdisInitializeWrapper(
if(!RegistryBuffer)
{
NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n"));
ExFreePool(Miniport);
ExFreePool(RegistryPath);
return;
}