[ros-diffs] [reactos] 01/01: [USBSTOR] Correctly terminate a REG_MULTI_SZ string returned by the IRP_MN_QUERY_ID handler

[Victor Perevertkin]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e512e29dc5126f9188c8…

commit 1e512e29dc5126f9188c83576bb703a7ce81681c
Author:     Victor Perevertkin <victor.perevertkin(a)reactos.org>
AuthorDate: Wed Jun 24 21:14:36 2020 +0300
Commit:     Victor Perevertkin <victor.perevertkin(a)reactos.org>
CommitDate: Wed Jun 24 21:15:58 2020 +0300

    [USBSTOR] Correctly terminate a REG_MULTI_SZ string
    returned by the IRP_MN_QUERY_ID handler
---
 drivers/usb/usbstor/pdo.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/usb/usbstor/pdo.c b/drivers/usb/usbstor/pdo.c
index e89eb45d382..86cf368bee6 100644
--- a/drivers/usb/usbstor/pdo.c
+++ b/drivers/usb/usbstor/pdo.c
@@ -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;