Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 05:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[UMPNPMGR] Use HeapReAlloc() to reallocate the PnP events buffer. Fix a memory leak in DeviceInstallThread().

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2018-12-23 14:06:03 +01:00
parent 9e18da43fe
commit 2955ed91ab
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
base/services/umpnpmgr/umpnpmgr.c
View file

@ -3476,6 +3476,7 @@ DeviceInstallThread(LPVOID lpParameter)
ResetEvent(hNoPendingInstalls);
Params = CONTAINING_RECORD(ListEntry, DeviceInstallParams, ListEntry);
InstallDevice(Params->DeviceIds, showWizard);
HeapFree(GetProcessHeap(), 0, Params);
}
}
@ -3486,10 +3487,11 @@ DeviceInstallThread(LPVOID lpParameter)
static DWORD WINAPI
PnpEventThread(LPVOID lpParameter)
{
PPLUGPLAY_EVENT_BLOCK PnpEvent;
ULONG PnpEventSize;
DWORD dwRet = ERROR_SUCCESS;
NTSTATUS Status;
RPC_STATUS RpcStatus;
PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent;
ULONG PnpEventSize;
UNREFERENCED_PARAMETER(lpParameter);
@ -3509,10 +3511,13 @@ PnpEventThread(LPVOID lpParameter)
if (Status == STATUS_BUFFER_TOO_SMALL)
{
PnpEventSize += 0x400;
HeapFree(GetProcessHeap(), 0, PnpEvent);
PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize);
if (PnpEvent == NULL)
return ERROR_OUTOFMEMORY;
NewPnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize);
if (NewPnpEvent == NULL)
{
dwRet = ERROR_OUTOFMEMORY;
break;
}
PnpEvent = NewPnpEvent;
continue;
}
@ -3619,7 +3624,7 @@ PnpEventThread(LPVOID lpParameter)
HeapFree(GetProcessHeap(), 0, PnpEvent);
return ERROR_SUCCESS;
return dwRet;
}