Changeset 49445 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 12, 2013 8:49:26 AM (11 years ago)

Author:

vboxsync

Message:

Main/HostDnsServiceWin: use sizeof() here

File:

• trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp

@@ -57 +57 @@
     do {
         CHAR keyName[256];
-        DWORD cbKeyName = 256;
+        DWORD cbKeyName = sizeof(keyName);
         DWORD keyType = 0;
         BYTE keyData[1024];
-        DWORD cbKeyData = 1024;
+        DWORD cbKeyData = sizeof(keyData);
 
         hrc = RegEnumValueA(g_hKeyTcpipParameters, regIndex, keyName, &cbKeyName, 0,
@@ -69 +69 @@
             if (   RTStrICmp("Domain", keyName) == 0
                 && cbKeyData > 1
-                && cbKeyData < 256)
+                && cbKeyData < sizeof(abDomain))
                 memcpy(abDomain, keyData, cbKeyData);
 
@@ -75 +75 @@
                      && cbKeyData > 1
                      && abDomain[0] == 0
-                     && cbKeyData < 256)
+                     && cbKeyData < sizeof(abDomain))
                 memcpy(abDomain, keyData, cbKeyData);
 
             else if (   RTStrICmp("NameServer", keyName) == 0
                      && cbKeyData > 1
-                     && cbKeyData < 256)
+                     && cbKeyData < sizeof(abNameServers))
                 memcpy(abNameServers, keyData, cbKeyData);
 
@@ -86 +86 @@
                      && cbKeyData > 1
                      && abNameServers[0] == 0
-                     && cbKeyData < 256)
+                     && cbKeyData < sizeof(abNameServers))
                 memcpy(abNameServers, keyData, cbKeyData);
 
             else if (   RTStrICmp("SearchList", keyName) == 0
                      && cbKeyData > 1
-                     && cbKeyData < 256)
+                     && cbKeyData < sizeof(abSearchList))
               memcpy(abSearchList, keyData, cbKeyData);
         }
@@ -130 +130 @@
 
         if (next)
-          strncpy(address, current, next - current);
+          strncpy(address, current, RT_MIN(sizeof(address)-1, next - current));
         else
           strcpy(address, current);