From 8c69510d92052607f94d947ce2dd3e0b40eee42f Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 7 Aug 2007 05:00:06 +0000 Subject: [PATCH] windows-afsd-uninit-vars-20070806 FIXES 67126 ensure the connp is set to NULL in case of error --- src/WINNT/afsd/cm_conn.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c index 1eeebbe7c..12f10f369 100644 --- a/src/WINNT/afsd/cm_conn.c +++ b/src/WINNT/afsd/cm_conn.c @@ -677,13 +677,13 @@ long cm_ConnByMServers(cm_serverRef_t *serversp, cm_user_t *usersp, int someBusy = 0, someOffline = 0, allOffline = 1, allBusy = 1, allDown = 1; long timeUsed, timeLeft, hardTimeLeft; + *connpp = NULL; + if (serversp == NULL) { osi_Log1(afsd_logp, "cm_ConnByMServers returning 0x%x", CM_ERROR_ALLDOWN); return CM_ERROR_ALLDOWN; } - *connpp = NULL; - timeUsed = (GetTickCount() - reqp->startTime) / 1000; /* leave 5 seconds margin of safety */ @@ -831,6 +831,8 @@ long cm_ConnByServer(cm_server_t *serverp, cm_user_t *userp, cm_conn_t **connpp) cm_conn_t *tcp; cm_ucell_t *ucellp; + *connpp = NULL; + lock_ObtainMutex(&userp->mx); lock_ObtainWrite(&cm_connLock); for (tcp = serverp->connsp; tcp; tcp=tcp->nextp) { -- 2.39.5