From: Garrett Wollman <wollman@csail.mit.edu>
Date: Tue, 9 Aug 2011 03:26:38 +0000 (-0400)
Subject: bos: don't dereference a null pointer when printing an error message
X-Git-Tag: upstream/1.6.0^2~46
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=32dcb109e35b96b2de81812d2ca613a47827811f;p=packages%2Fo%2Fopenafs.git

bos: don't dereference a null pointer when printing an error message

The parameter we are interested in is at MRAFS_OFFSET + 17, not
MRAFS_OFFSET + 13.

Found-by: clang static analyzer
Reviewed-on: http://gerrit.openafs.org/5178
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit bf4b2fd3e26dcf2a0db704815e05d77a558d38c6)

Change-Id: I92db9e5ec10054cef4421ab1b2fd0f60baaf07ca
Reviewed-on: http://gerrit.openafs.org/5222
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/bozo/bos.c b/src/bozo/bos.c
index 57e1a66b0..852e7ac71 100644
--- a/src/bozo/bos.c
+++ b/src/bozo/bos.c
@@ -1583,7 +1583,7 @@ SalvageCmd(struct cmd_syndesc *as, void *arock)
 			       &mrafsParm.OptResidencies);
 	    if (code) {
 		printf("bos: '%s' is not a valid residency mask.\n",
-		       as->parms[MRAFS_OFFSET + 13].items->data);
+		       as->parms[MRAFS_OFFSET + 17].items->data);
 		return code;
 	    }
 	}