hidclass.sys: Handle failure to parse preparseData.

Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

hidclass.sys: Handle failure to parse preparseData.
5fb6a94b · Aric Stewart · Alexandre Julliard · 5fa04222 · 5fb6a94b
Commit 5fb6a94b authored Mar 03, 2016 by Aric Stewart Committed by Alexandre Julliard Mar 04, 2016
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

pnp.c dlls/hidclass.sys/pnp.c +9 -1

No files found.
--- a/dlls/hidclass.sys/pnp.c
+++ b/dlls/hidclass.sys/pnp.c
@@ -212,8 +212,16 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
    }

    ext->preparseData = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[0].wReportLength);
-    ext->information.DescriptorSize = ext->preparseData->dwSize;
+
    HeapFree(GetProcessHeap(), 0, reportDescriptor);
+    if (!ext->preparseData)
+    {
+        ERR("Cannot parse Report Descriptor\n");
+        HID_DeleteDevice(&minidriver->minidriver, device);
+        return STATUS_NOT_SUPPORTED;
+    }
+
+    ext->information.DescriptorSize = ext->preparseData->dwSize;

    serial[0] = 0;
    status = call_minidriver(IOCTL_HID_GET_STRING, device,