From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Thu, 5 Jul 2012 22:22:24 +0000 (-0400)
Subject: Windows: Apply cm_GetVolServerList() to cm_ConnFromVolume()
X-Git-Tag: upstream/1.8.0_pre1^2~2250
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3b3b620a03b56dba7f0696f8175b9fb2c8fbd6ae;p=packages%2Fo%2Fopenafs.git

Windows: Apply cm_GetVolServerList() to cm_ConnFromVolume()

Use cm_GetVolServerList() in cm_ConnFromVolume() to ensure an
error is returned instead of dereferencing a NULL pointer if
the serverRef list for the requested volume cannot be obtained.

Change-Id: I265b7e8b64fcf6b4444c7d504e5109d67fa48089
Reviewed-on: http://gerrit.openafs.org/7724
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index 3043d5d49..21044e454 100644
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -1709,7 +1709,9 @@ long cm_ConnFromVolume(struct cm_volume *volp, unsigned long volid, struct cm_us
 
     *connpp = NULL;
 
-    serverspp = cm_GetVolServers(volp, volid, userp, reqp, &replicated);
+    code = cm_GetVolServerList(volp, volid, userp, reqp, &replicated, &serverspp);
+    if (code)
+        return code;
 
     code = cm_ConnByMServers(*serverspp, replicated, userp, reqp, connpp);
     cm_FreeServerList(serverspp, 0);