Changeset 40436 in vbox for trunk

Timestamp:

Mar 12, 2012 6:28:21 PM (13 years ago)

Author:

vboxsync

Message:

VbglR3CredentialsDestroyUtf16: RTUtf16Len returns the length as a count of RTUTF16 items, so multiply by sizeof(RTUTF16) to get the length.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp

@@ -146 +146 @@
         }
         else
-            VbglR3CredentialsDestroyUtf16(pwszUser, pwszPassword, pwszDomain,
-                                          3 /* Passes */);
-
-        VbglR3CredentialsDestroy(pszUser, pszPassword, pszDomain,
-                                 3 /* Passes */);
+            VbglR3CredentialsDestroyUtf16(pwszUser, pwszPassword, pwszDomain, 3 /* Passes */);
+        VbglR3CredentialsDestroy(pszUser, pszPassword, pszDomain, 3 /* Passes */);
     }
 
     return rc;
 }
+
 
 /**
@@ -183 +181 @@
 }
 
+
 /**
  * Clears and frees the three strings. UTF-16 version.
@@ -199 +198 @@
     /* wipe first */
     if (pwszUser)
-        RTMemWipeThoroughly(pwszUser,     RTUtf16Len(pwszUser) + sizeof(RTUTF16),     cPasses);
+        RTMemWipeThoroughly(pwszUser,     (RTUtf16Len(pwszUser)     + 1) * sizeof(RTUTF16), cPasses);
     if (pwszPassword)
-        RTMemWipeThoroughly(pwszPassword, RTUtf16Len(pwszPassword) + sizeof(RTUTF16), cPasses);
+        RTMemWipeThoroughly(pwszPassword, (RTUtf16Len(pwszPassword) + 1) * sizeof(RTUTF16), cPasses);
     if (pwszDomain)
-        RTMemWipeThoroughly(pwszDomain,   RTUtf16Len(pwszDomain) + sizeof(RTUTF16),   cPasses);
+        RTMemWipeThoroughly(pwszDomain,   (RTUtf16Len(pwszDomain)   + 1) * sizeof(RTUTF16), cPasses);
 
     /* then free. */