Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 16:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBHUB]

Browse source 
- Fix memory leak in failure case of CreateDeviceIds. Patch by Víctor Martínez Calvo. CID 1102364
CORE-11208 #resolve

svn path=/trunk/; revision=71301
This commit is contained in:
Thomas Faber 2016-05-09 17:44:16 +00:00
parent 6645a97ddb
commit 80c690a270
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/drivers/usb/usbhub/fdo.c
View file

@ -1035,6 +1035,9 @@ CreateDeviceIds(
{ {
// construct instance id buffer // construct instance id buffer
Index = swprintf(Buffer, L"%04d&%s", HubDeviceExtension->InstanceCount, SerialBuffer) + 1; Index = swprintf(Buffer, L"%04d&%s", HubDeviceExtension->InstanceCount, SerialBuffer) + 1;
ExFreePool(SerialBuffer);
UsbChildExtension->usInstanceId.Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, Index * sizeof(WCHAR)); UsbChildExtension->usInstanceId.Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, Index * sizeof(WCHAR));
if (UsbChildExtension->usInstanceId.Buffer == NULL) if (UsbChildExtension->usInstanceId.Buffer == NULL)
{ {
@ -1047,7 +1050,6 @@ CreateDeviceIds(
// //
RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR)); RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR));
UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR); UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR);
ExFreePool(SerialBuffer);
DPRINT("Usb InstanceId %wZ InstanceCount %x\n", &UsbChildExtension->usInstanceId, HubDeviceExtension->InstanceCount); DPRINT("Usb InstanceId %wZ InstanceCount %x\n", &UsbChildExtension->usInstanceId, HubDeviceExtension->InstanceCount);
return Status; return Status;