fix: memory leak when handling error case in EnumerateHub and Enumera…

…teHubPorts
microsoft · Sep 26, 2024 · 7b82850 · 7b82850
1 parent 616b191
commit 7b82850
Showing 1 changed file with 38 additions and 0 deletions.
diff --git a/usb/usbview/enum.c b/usb/usbview/enum.c
@@ -951,6 +951,16 @@ EnumerateHub (
         FREE(ConnectionInfo);
     }
 
+    if (ConnectionInfoV2)
+    {
+        FREE(ConnectionInfoV2);
+    }
+
+    if (PortConnectorProps)
+    {
+        FREE(PortConnectorProps);
+    }
+
     if (ConfigDesc)
     {
         FREE(ConfigDesc);
@@ -973,6 +983,16 @@ EnumerateHub (
 
         } while (StringDescs != NULL);
     }
+
+    if(DevProps)
+    {
+        FreeDeviceProperties(&DevProps);
+    }
+
+    if (hubCapabilityEx)
+    {
+        FREE(hubCapabilityEx);
+    }
 }
 
 //*****************************************************************************
@@ -1367,6 +1387,24 @@ EnumerateHubPorts (
                 {
                     FREE(connectionInfoExV2);
                 }
+
+                if (stringDescs != NULL)
+                {
+                    PSTRING_DESCRIPTOR_NODE Next;
+
+                    do {
+
+                        Next = stringDescs->Next;
+                        FREE(stringDescs);
+                        stringDescs = Next;
+
+                    } while (stringDescs != NULL);
+                }
+
+                if(DevProps)
+                {
+                    FreeDeviceProperties(&DevProps);
+                }
                 break;
             }