Changeset 46183 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

May 21, 2013 12:26:23 AM (12 years ago)

Author:

vboxsync

Message:

VBoxCredProv: intsafe.h _must_ be included before any vbox includes or you'll get a ton of warnings. Fixed a couple of warnings and adding a overflow check to RTUTF16ToUnicode and noting that the fCopy=true case (which isn't used currently) cannot be correctly implemented.

Location:

trunk/src/VBox/Additions/WINNT/VBoxCredProv

Files:

• VBoxCredProvCredential.cpp (modified) (4 diffs)
• VBoxCredProvCredential.h (modified) (1 diff)
• VBoxCredentialProvider.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvCredential.cpp

@@ -23 +23 @@
 # define WIN32_NO_STATUS
 #endif
+#include <intsafe.h>
 
 #include "VBoxCredentialProvider.h"
@@ -35 +36 @@
 #include <iprt/mem.h>
 #include <iprt/string.h>
+
 
 
@@ -121 +123 @@
  * @param   fCopy                   Whether to just assign or copy the actual buffer
  *                                  contents from source -> dest.
+ * @todo    r=bird: It appears that fCopy == true is never used, which is
+ *          fortunate as it (a) doesn't check for there being room in the
+ *          buffer, (b) terminate the string (which is customary, even if not
+ *          strictly necessary), and (c) overwrites MaximumLength.
  */
 HRESULT
 VBoxCredProvCredential::RTUTF16ToUnicode(PUNICODE_STRING pUnicodeDest, PRTUTF16 pwszSource, bool fCopy)
 {
-    AssertPtrReturn(pUnicodeDest, VERR_INVALID_POINTER);
-    AssertPtrReturn(pwszSource, VERR_INVALID_POINTER);
+    AssertPtrReturn(pUnicodeDest, E_POINTER);
+    AssertPtrReturn(pwszSource, E_POINTER);
 
     size_t cbLen = RTUtf16Len(pwszSource) * sizeof(RTUTF16);
-
-    pUnicodeDest->Length        = cbLen;
-    pUnicodeDest->MaximumLength = pUnicodeDest->Length;
+    AssertReturn(cbLen >= USHORT_MAX, E_INVALIDARG);
+
+    pUnicodeDest->Length        = (USHORT)cbLen;
+    pUnicodeDest->MaximumLength = (USHORT)cbLen;
 
     if (fCopy)
+    {
+        AssertFailed(/*see todo*/);
         memcpy(pUnicodeDest->Buffer, pwszSource, cbLen);
+    }
     else /* Just assign the buffer. */
         pUnicodeDest->Buffer    = pwszSource;
@@ -602 +612 @@
         &&  pPos != pwszAccountData)
     {
-        DWORD cbSize = (pPos - pwszAccountData) * sizeof(WCHAR);
+        size_t cbSize = (pPos - pwszAccountData) * sizeof(WCHAR);
         LPWSTR pwszName = (LPWSTR)CoTaskMemAlloc(cbSize + sizeof(WCHAR)); /* Space for terminating zero. */
         LPWSTR pwszDomain = NULL;

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvCredential.h

@@ -24 +24 @@
 *******************************************************************************/
 #include <Windows.h>
-#include <intsafe.h>
 #include <NTSecAPI.h>
 #define SECURITY_WIN32

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.h

@@ -19 +19 @@
 #define ___VBOX_CREDENTIALPROVIDER_H___
 
-#include <windows.h>
+#include <Windows.h>
 #include <credentialprovider.h>