From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 27 Aug 2007 01:05:24 +0000 (+0000)
Subject: DEVEL15-windows-recursion-fix-20070826
X-Git-Tag: openafs-devel-1_5_24~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=18027c276bd924a7a9de64bc15605eb7fc245031;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-recursion-fix-20070826


protect against a null pointer dereference


(cherry picked from commit cd0a515e9f68604ab0fef15a9b7110402d2bc8a9)
---

diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c
index 4e759df1b..835e07533 100644
--- a/src/WINNT/afsd/cm_vnodeops.c
+++ b/src/WINNT/afsd/cm_vnodeops.c
@@ -1922,7 +1922,9 @@ long cm_NameI(cm_scache_t *rootSCachep, char *pathp, long flags,
                             fids[fid_count++] = nscp->fid;
                         }
                     }
-                } else {
+                }
+
+                if (code) {
 		    cm_ReleaseSCache(tscp);
 		    if (dirScp)
 			cm_ReleaseSCache(dirScp);
@@ -1935,7 +1937,8 @@ long cm_NameI(cm_scache_t *rootSCachep, char *pathp, long flags,
 			osi_Log1(afsd_logp,"cm_NameI code 0x%x", code);
 			return code;
 		    }
-		}	
+		}
+
 		haveComponent = 0;	/* component done */
 		if (dirScp)
 		    cm_ReleaseSCache(dirScp);