Initialize tvc in afs_remove so that we don't call afs_PutVCache

on stack garbage in case of some failure.

(cherry picked from commit 0329c5fbb42d14da20acb97ebda48b9974220b0e)

diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c
index 93fd43c85c0cef3ff36ce2cfec345e76cf7fddd9..ad65b6c0fc108627c2ee57ea531c3d97cc71b159 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_remove.c
+++ b/src/afs/VNOPS/afs_vnop_remove.c
@@ -233,6 +233,10 @@ afs_remove(OSI_VC_ARG(adp), aname, acred)
     afs_Trace2(afs_iclSetp, CM_TRACE_REMOVE, ICL_TYPE_POINTER, adp,
               ICL_TYPE_STRING, aname);
 
+#ifdef AFS_OSF_ENV
+    tvc = (struct vcache *)ndp->ni_vp;  /* should never be null */
+#endif
+
     /* Check if this is dynroot */
     if (afs_IsDynroot(adp)) {
 #ifdef  AFS_OSF_ENV