Changeset 30852 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Jul 14, 2010 6:16:12 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

63674

Message:

VBox/VMMDev.h: VMMDEV_CREDENTIALS_STRLEN -> VMMDEV_CREDENTIALS_SZ_SIZE; the former was easily confused with what the strlen() returns.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (4 diffs)
• VMMDevState.h (modified) (2 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -1631 +1631 @@
 
                 /* let's start by nulling out the data */
-                memset(credentials->szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN);
-                memset(credentials->szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN);
-                memset(credentials->szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN);
+                memset(credentials->szUserName, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+                memset(credentials->szPassword, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+                memset(credentials->szDomain, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
 
                 /* should we return whether we got credentials for a logon? */
@@ -1670 +1670 @@
                     if (credentials->u32Flags & VMMDEV_CREDENTIALS_CLEAR)
                     {
-                        memset(pThis->pCredentials->Logon.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN);
-                        memset(pThis->pCredentials->Logon.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN);
-                        memset(pThis->pCredentials->Logon.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN);
+                        memset(pThis->pCredentials->Logon.szUserName, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+                        memset(pThis->pCredentials->Logon.szPassword, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+                        memset(pThis->pCredentials->Logon.szDomain, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
                     }
                 }
@@ -1690 +1690 @@
                 if (credentials->u32Flags & VMMDEV_CREDENTIALS_CLEARJUDGE)
                 {
-                    memset(pThis->pCredentials->Judge.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN);
-                    memset(pThis->pCredentials->Judge.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN);
-                    memset(pThis->pCredentials->Judge.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN);
+                    memset(pThis->pCredentials->Judge.szUserName, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+                    memset(pThis->pCredentials->Judge.szPassword, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+                    memset(pThis->pCredentials->Judge.szDomain, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
                 }
 
@@ -2682 +2682 @@
     if (!pThis->fKeepCredentials)
     {
-        memset(pThis->pCredentials->Logon.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN);
-        memset(pThis->pCredentials->Logon.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN);
-        memset(pThis->pCredentials->Logon.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN);
-    }
-    memset(pThis->pCredentials->Judge.szUserName, '\0', VMMDEV_CREDENTIALS_STRLEN);
-    memset(pThis->pCredentials->Judge.szPassword, '\0', VMMDEV_CREDENTIALS_STRLEN);
-    memset(pThis->pCredentials->Judge.szDomain, '\0', VMMDEV_CREDENTIALS_STRLEN);
+        memset(pThis->pCredentials->Logon.szUserName, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+        memset(pThis->pCredentials->Logon.szPassword, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+        memset(pThis->pCredentials->Logon.szDomain, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+    }
+    memset(pThis->pCredentials->Judge.szUserName, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+    memset(pThis->pCredentials->Judge.szPassword, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
+    memset(pThis->pCredentials->Judge.szDomain, '\0', VMMDEV_CREDENTIALS_SZ_SIZE);
 
     /* Reset means that additions will report again. */

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -65 +65 @@
     struct
     {
-        char szUserName[VMMDEV_CREDENTIALS_STRLEN];
-        char szPassword[VMMDEV_CREDENTIALS_STRLEN];
-        char szDomain[VMMDEV_CREDENTIALS_STRLEN];
+        char szUserName[VMMDEV_CREDENTIALS_SZ_SIZE];
+        char szPassword[VMMDEV_CREDENTIALS_SZ_SIZE];
+        char szDomain[VMMDEV_CREDENTIALS_SZ_SIZE];
         bool fAllowInteractiveLogon;
     } Logon;
@@ -74 +74 @@
     struct
     {
-        char szUserName[VMMDEV_CREDENTIALS_STRLEN];
-        char szPassword[VMMDEV_CREDENTIALS_STRLEN];
-        char szDomain[VMMDEV_CREDENTIALS_STRLEN];
+        char szUserName[VMMDEV_CREDENTIALS_SZ_SIZE];
+        char szPassword[VMMDEV_CREDENTIALS_SZ_SIZE];
+        char szDomain[VMMDEV_CREDENTIALS_SZ_SIZE];
     } Judge;
 } VMMDEVCREDS;