Changeset 54729 in vbox for trunk/src/VBox

Timestamp:

Mar 12, 2015 5:21:24 AM (10 years ago)

Author:

vboxsync

Message:

VBoxUSB: use try/catch to handle possible errors and set the last element to NULL according to the recommendations

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp

@@ -601 +601 @@
         return STATUS_INSUFFICIENT_RESOURCES;
     }
-
+        
     for (i = 0; i < pCfgDr->bNumInterfaces; i++)
     {
         pIfLe[i].InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(pCfgDr, pCfgDr, i, 0, -1, -1, -1);
+                pIfLe[i].Interface = NULL;
         if (!pIfLe[i].InterfaceDescriptor)
         {
@@ -612 +613 @@
         }
     }
-
+        pIfLe[pCfgDr->bNumInterfaces].InterfaceDescriptor = NULL;
+        
     if (NT_SUCCESS(Status))
     {
@@ -659 +661 @@
                         *pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo = *pIfLe[i].Interface;
 
-                        for (ULONG j = 0; j < pIfLe[i].Interface->NumberOfPipes; j++)
-                        {
-                            pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo->Pipes[j] = pIfLe[i].Interface->Pipes[j];
-                            pDevExt->Rt.pVBIfaceInfo[i].pPipeInfo[j].EndpointAddress = pIfLe[i].Interface->Pipes[j].EndpointAddress;
-                            pDevExt->Rt.pVBIfaceInfo[i].pPipeInfo[j].NextScheduledFrame = 0;
-                        }
+                                                // AM try/catch for handle citrix case with wrong data from device.
+                                                __try
+                                                {
+                                                        for (ULONG j = 0; j < pIfLe[i].Interface->NumberOfPipes; j++)
+                                                        {
+                                                                pDevExt->Rt.pVBIfaceInfo[i].pInterfaceInfo->Pipes[j] = pIfLe[i].Interface->Pipes[j];
+                                                                pDevExt->Rt.pVBIfaceInfo[i].pPipeInfo[j].EndpointAddress = pIfLe[i].Interface->Pipes[j].EndpointAddress;
+                                                                pDevExt->Rt.pVBIfaceInfo[i].pPipeInfo[j].NextScheduledFrame = 0;
+                                                        }
+                                                }
+                                                __except (EXCEPTION_EXECUTE_HANDLER)
+                                                {
+                                                        Status = GetExceptionCode();
+                                                        break;
+                                                }
                     }