Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBSTOR] Correctly terminate a REG_MULTI_SZ string

Browse source 
returned by the IRP_MN_QUERY_ID handler
This commit is contained in:
Victor Perevertkin 2020-06-24 21:14:36 +03:00
parent a279b1d2c6
commit 1e512e29dc
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/usbstor/pdo.c
View file

@ -360,6 +360,7 @@ USBSTOR_PdoHandleQueryHardwareId(
Id7Length = strlen(Id7) + 1;
DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId7 %s\n", Id7);
// last +1 is for terminating \0 of REG_MULTI_SZ
TotalLength = Id1Length + Id2Length + Id3Length + Id4Length + Id5Length + Id6Length + Id7Length + 1;
Buffer = ExAllocatePoolWithTag(PagedPool, TotalLength * sizeof(WCHAR), USB_STOR_TAG);
@ -381,6 +382,8 @@ USBSTOR_PdoHandleQueryHardwareId(
USBSTOR_ConvertToUnicodeString(Id6, Length, Offset, Buffer, &Offset);
USBSTOR_ConvertToUnicodeString(Id7, Length, Offset, Buffer, &Offset);
Buffer[Offset] = UNICODE_NULL; // finish the REG_MULTI_SZ
ASSERT(Offset + 1 == Length);
Irp->IoStatus.Information = (ULONG_PTR)Buffer;
@ -406,6 +409,7 @@ USBSTOR_PdoHandleQueryCompatibleId(
// format instance id
Length = sprintf(Buffer, "USBSTOR\\%s", DeviceType) + 1;
// +1 for terminating \0 and another +1 for \0 at the end of REG_MULTI_SZ
Length += sprintf(&Buffer[Length], "USBSTOR\\%s", "RAW") + 2;
InstanceId = ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), USB_STOR_TAG);
@ -418,6 +422,8 @@ USBSTOR_PdoHandleQueryCompatibleId(
USBSTOR_ConvertToUnicodeString(Buffer, Length, 0, InstanceId, &Offset);
USBSTOR_ConvertToUnicodeString(&Buffer[Offset], Length, Offset, InstanceId, &Offset);
InstanceId[Offset] = UNICODE_NULL; // finish the REG_MULTI_SZ
DPRINT("USBSTOR_PdoHandleQueryCompatibleId %S\n", InstanceId);
Irp->IoStatus.Information = (ULONG_PTR)InstanceId;