- Fix memory leaks when reading strings and binary values from the registry

[reactos.git] / reactos / drivers / network / ndis / ndis / config.c

diff --git a/reactos/drivers/network/ndis/ndis/config.c b/reactos/drivers/network/ndis/ndis/config.c
index e409379..b95f1e0 100644 (file)
--- a/reactos/drivers/network/ndis/ndis/config.c
+++ b/reactos/drivers/network/ndis/ndis/config.c
@@ -65,7 +65,7 @@ NdisWriteConfiguration(
     ULONG ParameterType;
     ULONG DataSize;
     PVOID Data;
-    WCHAR Buff[25];
+    WCHAR Buff[11];
 
     NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 
@@ -86,6 +86,7 @@ NdisWriteConfiguration(
                       ParameterValue->ParameterData.IntegerData,
                       (ParameterValue->ParameterType == NdisParameterInteger) ? 10 : 16, &Str)))
                  {
+                      NDIS_DbgPrint(MIN_TRACE, ("RtlIntegerToUnicodeString failed (%x)\n", *Status));
                       *Status = NDIS_STATUS_FAILURE;
                       return;
                  }
@@ -138,14 +139,43 @@ NdisCloseConfiguration(
 {
     PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext = (PMINIPORT_CONFIGURATION_CONTEXT)ConfigurationHandle;
     PMINIPORT_RESOURCE Resource;
+    PNDIS_CONFIGURATION_PARAMETER ParameterValue;
+    PLIST_ENTRY CurrentEntry;
 
-    while(!IsListEmpty(&ConfigurationContext->ResourceListHead))
+    while((CurrentEntry = ExInterlockedRemoveHeadList(&ConfigurationContext->ResourceListHead,
+                                                      &ConfigurationContext->ResourceLock)) != NULL)
     {
-        Resource = (PMINIPORT_RESOURCE)ExInterlockedRemoveHeadList(&ConfigurationContext->ResourceListHead, &ConfigurationContext->ResourceLock);
-        if(Resource->ResourceType == MINIPORT_RESOURCE_TYPE_MEMORY)
+        Resource = CONTAINING_RECORD(CurrentEntry, MINIPORT_RESOURCE, ListEntry);
+        switch(Resource->ResourceType)
         {
+          case MINIPORT_RESOURCE_TYPE_REGISTRY_DATA:
+            ParameterValue = Resource->Resource;
+
+            switch (ParameterValue->ParameterType)
+            {
+               case NdisParameterBinary:
+                 ExFreePool(ParameterValue->ParameterData.BinaryData.Buffer);
+                 break;
+
+               case NdisParameterString:
+               case NdisParameterMultiString:
+                 ExFreePool(ParameterValue->ParameterData.StringData.Buffer);
+                 break;
+
+               default:
+                 break;
+            }
+
+          /* Fall through to free NDIS_CONFIGURATION_PARAMETER struct */
+
+          case MINIPORT_RESOURCE_TYPE_MEMORY:
             NDIS_DbgPrint(MAX_TRACE,("freeing 0x%x\n", Resource->Resource));
             ExFreePool(Resource->Resource);
+            break;
+
+          default:
+            NDIS_DbgPrint(MIN_TRACE,("Unknown resource type: %d\n", Resource->ResourceType));
+            break;
         }
 
         ExFreePool(Resource);
@@ -358,7 +388,7 @@ NdisReadConfiguration(
             return;
         }
 
-        MiniportResource->ResourceType = 0;
+        MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA;
         MiniportResource->Resource = *ParameterValue;
 
         NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n",
@@ -397,7 +427,7 @@ NdisReadConfiguration(
             return;
         }
 
-        MiniportResource->ResourceType = 0;
+        MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA;
         MiniportResource->Resource = *ParameterValue;
         NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource));
         ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead,
@@ -433,7 +463,7 @@ NdisReadConfiguration(
             return;
         }
 
-        MiniportResource->ResourceType = 0;
+        MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA;
         MiniportResource->Resource = *ParameterValue;
         NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource));
         ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead,
@@ -577,7 +607,7 @@ NdisReadConfiguration(
          }
     }
 
-    MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_MEMORY;
+    MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_REGISTRY_DATA;
     MiniportResource->Resource = *ParameterValue;
 
     ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock);
@@ -674,7 +704,7 @@ NdisReadNetworkAddress(
 
     if (ParameterValue->ParameterType == NdisParameterInteger)
     {
-        WCHAR Buff[25];
+        WCHAR Buff[11];
 
         NDIS_DbgPrint(MAX_TRACE, ("Read integer data %lx\n",
                                   ParameterValue->ParameterData.IntegerData));
@@ -702,9 +732,9 @@ NdisReadNetworkAddress(
         str = ParameterValue->ParameterData.StringData;
     }
 
-    while (str.Buffer[j] != '\0') j++;
-         
-    *NetworkAddressLength = (UINT)((j/2)+0.5);
+    while (j < str.Length && str.Buffer[j] != '\0') j++;
+    
+    *NetworkAddressLength = (j+1) >> 1;
 
     if ((*NetworkAddressLength) == 0)
     {
@@ -730,7 +760,7 @@ NdisReadNetworkAddress(
         return;
     }
 
-    MiniportResource->ResourceType = 0;
+    MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_MEMORY;
     MiniportResource->Resource = IntArray;
     NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource));
     ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock);