From e1eba145843996ce50eae79356a3f88b92a2ea86 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 3 Apr 2012 09:09:42 -0400 Subject: [PATCH 1/1] Windows: cm_GetNewSCache must return NULL on failure cm_GetNewSCache was leaking a valid cm_scache_t pointer in some failure cases. On failure, explicitly set the return value to NULL. Change-Id: I074b278f969224aa535abe256ac33a90d0f4e62d Reviewed-on: http://gerrit.openafs.org/7037 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsd/cm_scache.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c index ab37205..b94f80f 100644 --- a/src/WINNT/afsd/cm_scache.c +++ b/src/WINNT/afsd/cm_scache.c @@ -339,7 +339,7 @@ cm_GetNewSCache(afs_uint32 locked) */ cm_AdjustScacheLRU(scp); - /* and we're done */ + /* and we're done - SUCCESS */ osi_assertx(!(scp->flags & CM_SCACHEFLAG_INHASH), "CM_SCACHEFLAG_INHASH set"); goto done; } @@ -362,6 +362,8 @@ cm_GetNewSCache(afs_uint32 locked) osi_Log2(afsd_logp, "GetNewSCache all scache entries in use (attempt = %d, count = %u)", attempt, count); } + /* FAILURE */ + scp = NULL; goto done; } -- 1.9.4