From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 16 May 2007 16:51:05 +0000 (+0000)
Subject: DEVEL15-windows-afsd-uninitialized-20070516
X-Git-Tag: openafs-devel-1_5_20~17
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d0bd4c319ff992fd20f85f0bb6b2cc635e5cc0b9;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-afsd-uninitialized-20070516


Do not use uninitialized variables in log messages

Do not dereference NULL pointers


(cherry picked from commit 82d2cc5b7fb638073e859e6a2b03b97722f518d9)
---

diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index 852ef0b9c..331cbaa56 100644
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -1334,9 +1334,13 @@ void cm_MergeStatus(cm_scache_t *dscp,
 	scp->anyAccess = 0;
 	scp->dataVersion = 0;
 
-	scp->parentVnode = dscp->fid.vnode;
-	scp->parentUnique = dscp->fid.unique;
-
+	if (dscp) {
+            scp->parentVnode = dscp->fid.vnode;
+            scp->parentUnique = dscp->fid.unique;
+	} else {
+            scp->parentVnode = 0;
+            scp->parentUnique = 0;
+	}
 	return;
     } else {
 	scp->flags &= ~CM_SCACHEFLAG_EACCESS;
diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c
index 40ec07b19..6c91b5d0c 100644
--- a/src/WINNT/afsd/smb3.c
+++ b/src/WINNT/afsd/smb3.c
@@ -3292,8 +3292,8 @@ long smb_ReceiveTran2SetFileInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet
     smb_fid_t *fidp;
     unsigned short infoLevel;
     smb_tran2Packet_t *outp;
-    cm_user_t *userp;
-    cm_scache_t *scp;
+    cm_user_t *userp = NULL;
+    cm_scache_t *scp = NULL;
     cm_req_t req;
 
     cm_InitReq(&req);
@@ -3320,7 +3320,7 @@ long smb_ReceiveTran2SetFileInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet
     if (infoLevel == SMB_SET_FILE_DISPOSITION_INFO && 
 	!(fidp->flags & SMB_FID_OPENDELETE)) {
 	osi_Log3(smb_logp,"smb_ReceiveTran2SetFileInfo !SMB_FID_OPENDELETE fidp 0x%p scp 0x%p fidp->flags 0x%x", 
-		  fidp, scp, fidp->flags);
+		  fidp, fidp->scp, fidp->flags);
 	lock_ReleaseMutex(&fidp->mx);
         smb_ReleaseFID(fidp);
         smb_SendTran2Error(vcp, p, opx, CM_ERROR_NOACCESS);
@@ -3330,7 +3330,7 @@ long smb_ReceiveTran2SetFileInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet
 	 infoLevel == SMB_SET_FILE_END_OF_FILE_INFO)
          && !(fidp->flags & SMB_FID_OPENWRITE)) {
 	osi_Log3(smb_logp,"smb_ReceiveTran2SetFileInfo !SMB_FID_OPENWRITE fidp 0x%p scp 0x%p fidp->flags 0x%x", 
-		  fidp, scp, fidp->flags);
+		  fidp, fidp->scp, fidp->flags);
 	lock_ReleaseMutex(&fidp->mx);
         smb_ReleaseFID(fidp);
         smb_SendTran2Error(vcp, p, opx, CM_ERROR_NOACCESS);