DEVEL15-windows-afslogon-null-pointer-deref-20071211

LICENSE MIT

'tokenUser' can be dereferenced when NULL if GetTokenInformation() fails.

(cherry picked from commit 8f84815d0d8c9cc0b49eb29bfceeb03a7ae7f04f)

diff --git a/src/WINNT/afsd/afslogon.c b/src/WINNT/afsd/afslogon.c
index f13d9056a48d0e468c3a39b17c35d69db95ef68c..f92f788315211bf131e2bb23538fac3d67450fef 100644 (file)
--- a/src/WINNT/afsd/afslogon.c
+++ b/src/WINNT/afsd/afslogon.c
@@ -1230,7 +1230,7 @@ VOID AFS_Logoff_Event( PWLX_NOTIFICATION_INFO pInfo )
            /* We can't use pInfo->Domain for the domain since in the cross realm case 
             * this is source domain and not the destination domain.
             */
-           if (QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, pInfo->Domain)) {
+           if (tokenUser && QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, pInfo->Domain)) {
                WCHAR Domain[64]=L"";
                GetLocalShortDomain(Domain, sizeof(Domain));
                if (QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, Domain)) {
@@ -1342,7 +1342,7 @@ VOID AFS_Logon_Event( PWLX_NOTIFICATION_INFO pInfo )
     /* We can't use pInfo->Domain for the domain since in the cross realm case 
      * this is source domain and not the destination domain.
      */
-    if (QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, pInfo->Domain)) {
+    if (tokenUser && QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, pInfo->Domain)) {
         WCHAR Domain[64]=L"";
         GetLocalShortDomain(Domain, sizeof(Domain));
         if (QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, Domain)) {