From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 22 Feb 2010 17:15:15 +0000 (-0500)
Subject: analyze paranoia
X-Git-Tag: openafs-stable-1_4_12pre4~8
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=15540ac6f9f21154f0caa62a8a761963b4380180;p=packages%2Fo%2Fopenafs.git

analyze paranoia

don't pass a null pointer to FindVolume in case one shows up

Change-Id: I76258d8f8ca18c536e3faa776df3e06005fe2bc2
Reviewed-on: http://gerrit.openafs.org/1360
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 48908e2a932420fe67fe1065d55f7e458b5cd1c2)
Reviewed-on: http://gerrit.openafs.org/1361
---

diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
index 861b7e522..8217a9707 100644
--- a/src/afs/afs_analyze.c
+++ b/src/afs/afs_analyze.c
@@ -672,8 +672,9 @@ afs_Analyze(register struct afs_conn *aconn, afs_int32 acode,
     if ((acode < 0) && (acode != VRESTARTING)) {
 	if (acode == RX_CALL_TIMEOUT) {
 	    serversleft = afs_BlackListOnce(areq, afid, tsp);
-	    tvp = afs_FindVolume(afid, READ_LOCK);
-	    if (!tvp || (tvp->states & VRO))
+	    if (afid)
+		tvp = afs_FindVolume(afid, READ_LOCK);
+	    if (!afid || !tvp || (tvp->states & VRO))
 		areq->idleError++;
 	    if ((serversleft == 0) && tvp &&
 		((tvp->states & VRO) || (tvp->states & VBackup))) {