Index: base/applications/cmdutils/whoami/whoami.c
===================================================================
--- base/applications/cmdutils/whoami/whoami.c	(revision 71056)
+++ base/applications/cmdutils/whoami/whoami.c	(working copy)
@@ -8,6 +8,7 @@
 
 
 #define SECURITY_WIN32
+#include <assert.h>
 #include <security.h>
 #include <sddl.h>
 
@@ -139,6 +140,7 @@
 
     if (OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &hToken))
     {
+        /* Request the needed length */
         GetTokenInformation(hToken,
                             TokenType,
                             NULL,
@@ -145,6 +147,9 @@
                             dwLength,
                             &dwLength);
 
+        /* Expect an ERROR_INSUFFICIENT_BUFFER */
+        assert(GetLastError() == ERROR_INSUFFICIENT_BUFFER);
+
         if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
         {
             pTokenInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength);