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 4e759df1b41a7f20e12bec8132738193618bb3be..835e0753314659dd34982d85af300c736882d06a 100644 (file)
--- 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);