From 8a72dad9206070d8bfa07baf4a2e74c72e371b00 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 7 Aug 2007 05:00:49 +0000
Subject: [PATCH] DEVEL15-windows-afsd-uninit-vars-20070806

FIXES 67126

ensure the connp is set to NULL in case of error


(cherry picked from commit 8c69510d92052607f94d947ce2dd3e0b40eee42f)
---
 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 275afde2f..b635998cc 100644
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -709,13 +709,13 @@ long cm_ConnByMServers(cm_serverRef_t *serversp, cm_user_t *usersp,
     struct timeval now;
 #endif /* DJGPP */        
 
+    *connpp = NULL;
+
     if (serversp == NULL) {
 	osi_Log1(afsd_logp, "cm_ConnByMServers returning 0x%x", CM_ERROR_ALLDOWN);
 	return CM_ERROR_ALLDOWN;
     }
 
-    *connpp = NULL;
-
 #ifndef DJGPP
     timeUsed = (GetTickCount() - reqp->startTime) / 1000;
 #else
@@ -868,6 +868,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