[ros-diffs] [cgutman] 41585: - Fix a crash when reading the network address from the registry - Fixes bug 4634

[cgutman at svn.reactos.org]

Author: cgutman
Date: Tue Jun 23 17:58:56 2009
New Revision: 41585

URL: http://svn.reactos.org/svn/reactos?rev=41585&view=rev
Log:
 - Fix a crash when reading the network address from the registry
 - Fixes bug 4634

Modified:
    trunk/reactos/drivers/network/ndis/ndis/config.c

Modified: trunk/reactos/drivers/network/ndis/ndis/config.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/config.c?rev=41585&r1=41584&r2=41585&view=diff
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Tue Jun 23 17:58:56 2009
@@ -662,6 +662,7 @@
     NDIS_STRING Keyword;
     UINT *IntArray = 0;
     UINT i,j = 0;
+    NDIS_STRING str;
 
     NdisInitUnicodeString(&Keyword, L"NetworkAddress");
     NdisReadConfiguration(Status, &ParameterValue, ConfigurationHandle, &Keyword, NdisParameterString);
@@ -672,11 +673,41 @@
         return;
     }
 
-    while (ParameterValue->ParameterData.StringData.Buffer[j] != '\0') j++;
-
+    if (ParameterValue->ParameterType == NdisParameterInteger)
+    {
+        WCHAR Buff[25];
+
+        NDIS_DbgPrint(MAX_TRACE, ("Read integer data %lx\n",
+                                  ParameterValue->ParameterData.IntegerData));
+
+        str.Buffer = Buff;
+        str.MaximumLength = (USHORT)sizeof(Buff);
+        str.Length = 0;
+
+        *Status = RtlIntegerToUnicodeString(ParameterValue->ParameterData.IntegerData,
+                                            10,
+                                            &str);
+
+        if (*Status != NDIS_STATUS_SUCCESS)
+        {
+            NDIS_DbgPrint(MIN_TRACE, ("RtlIntegerToUnicodeString failed (%x)\n", *Status));
+            *Status = NDIS_STATUS_FAILURE;
+            return;
+        }
+
+        NDIS_DbgPrint(MAX_TRACE, ("Converted integer data into %wZ\n", &str));
+    }
+    else
+    {
+        ASSERT(ParameterValue->ParameterType == NdisParameterString);
+        str = ParameterValue->ParameterData.StringData;
+    }
+
+    while (str.Buffer[j] != '\0') j++;
+         
     *NetworkAddressLength = (UINT)((j/2)+0.5);
 
-    if (j == 0)
+    if ((*NetworkAddressLength) == 0)
     {
         NDIS_DbgPrint(MIN_TRACE,("Empty NetworkAddress registry entry.\n"));
         *Status = NDIS_STATUS_FAILURE;
@@ -708,8 +739,8 @@
     /* convert from string to bytes */
     for(i=0; i<(*NetworkAddressLength); i++)
     {
-        IntArray[i] = (UnicodeToHexByte((ParameterValue->ParameterData.StringData.Buffer)[2*i]) << 4) +
-                UnicodeToHexByte((ParameterValue->ParameterData.StringData.Buffer)[2*i+1]);
+        IntArray[i] = (UnicodeToHexByte((str.Buffer)[2*i]) << 4) +
+                UnicodeToHexByte((str.Buffer)[2*i+1]);
     }
 
     *NetworkAddress = IntArray;