From 38f543b2d676dec0f00e44588f6b48d4c94a270c Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 26 Aug 2006 17:13:43 +0000 Subject: [PATCH] STABLE14-windows-misc-20060826 (1) verify uidp before use (2) initialize variables before use --- src/WINNT/afsd/afsd_init.c | 2 +- src/WINNT/afsd/smb3.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c index 17ff83fa00..bc9d7fee4e 100644 --- a/src/WINNT/afsd/afsd_init.c +++ b/src/WINNT/afsd/afsd_init.c @@ -268,7 +268,7 @@ configureBackConnectionHostNames(void) HKEY hkMSV10; HKEY hkClient; DWORD dwType; - DWORD dwSize, dwAllocSize; + DWORD dwSize = 0, dwAllocSize = 0; DWORD dwValue; PBYTE pHostNames = NULL, pName = NULL; BOOL bNameFound = FALSE; diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c index 42faf006cb..eb7808dc70 100644 --- a/src/WINNT/afsd/smb3.c +++ b/src/WINNT/afsd/smb3.c @@ -879,12 +879,14 @@ long smb_ReceiveV3SessionSetupX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t * lock_ReleaseMutex(&unp->mx); uidp = smb_FindUID(vcp, newUid, SMB_FLAG_CREATE); - lock_ObtainMutex(&uidp->mx); - uidp->unp = unp; - osi_LogEvent("AFS smb_ReceiveV3SessionSetupX",NULL,"MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d],TicketKTCName[%s]",(int)vcp,vcp->lana,vcp->lsn,newUid,osi_LogSaveString(smb_logp, usern)); - osi_Log4(smb_logp,"smb_ReceiveV3SessionSetupX MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d]",vcp,vcp->lana,vcp->lsn,newUid); - lock_ReleaseMutex(&uidp->mx); - smb_ReleaseUID(uidp); + if (uidp) { + lock_ObtainMutex(&uidp->mx); + uidp->unp = unp; + osi_LogEvent("AFS smb_ReceiveV3SessionSetupX",NULL,"MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d],TicketKTCName[%s]",(int)vcp,vcp->lana,vcp->lsn,newUid,osi_LogSaveString(smb_logp, usern)); + osi_Log4(smb_logp,"smb_ReceiveV3SessionSetupX MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d]",vcp,vcp->lana,vcp->lsn,newUid); + lock_ReleaseMutex(&uidp->mx); + smb_ReleaseUID(uidp); + } } /* Return UID to the client */