Aric Stewart : hidclass.sys: Handle failure to parse preparseData.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5fb6a94bb9c5688a27b01cf65bdec0774b481a36
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5fb6a94bb9c5688a27b01cf65b...

Author: Aric Stewart <aric(a)codeweavers.com>
Date:   Thu Mar  3 12:53:06 2016 -0600

hidclass.sys: Handle failure to parse preparseData.

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

---

 dlls/hidclass.sys/pnp.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c
index 24dd140..5de7522 100644
--- 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,