From 5c5515a5c3b34f9a115b29378e123c779c138f51 Mon Sep 17 00:00:00 2001 From: Nickolai Zeldovich Date: Sat, 5 Jan 2013 23:44:33 -0500 Subject: [PATCH] volser/vol_split.c: do not dereference known-NULL pointer Avoid dereferencing a pointer that we just checked is NULL when printing an error message. Change-Id: Ibc89883977e7044cab2a844d97b7f0f7d236f4ea Reviewed-on: http://gerrit.openafs.org/8878 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/volser/vol_split.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/volser/vol_split.c b/src/volser/vol_split.c index c6f31c3a14..5b39496cbd 100644 --- a/src/volser/vol_split.c +++ b/src/volser/vol_split.c @@ -239,9 +239,9 @@ copyDir(struct Msg *m, IHandle_t *inh, IHandle_t *outh) infdP = IH_OPEN(inh); if (!infdP) { sprintf(m->line, "Couldn't open input directory %" AFS_VOLID_FMT ".%u.%u\n", - afs_printable_VolumeId_lu(infdP->fd_ih->ih_vid), - (afs_uint32)(infdP->fd_ih->ih_ino & NAMEI_VNODEMASK), - (afs_uint32)(infdP->fd_ih->ih_ino >> NAMEI_UNIQSHIFT)); + afs_printable_VolumeId_lu(inh->ih_vid), + (afs_uint32)(inh->ih_ino & NAMEI_VNODEMASK), + (afs_uint32)(inh->ih_ino >> NAMEI_UNIQSHIFT)); rx_Write(m->call, m->line, strlen(m->line)); return EIO; } @@ -257,9 +257,9 @@ copyDir(struct Msg *m, IHandle_t *inh, IHandle_t *outh) outfdP = IH_OPEN(outh); if (!outfdP) { sprintf(m->line, "Couldn't open output directory %" AFS_VOLID_FMT ".%u.%u\n", - afs_printable_VolumeId_lu(outfdP->fd_ih->ih_vid), - (afs_uint32)(outfdP->fd_ih->ih_ino & NAMEI_VNODEMASK), - (afs_uint32)(outfdP->fd_ih->ih_ino >> NAMEI_UNIQSHIFT)); + afs_printable_VolumeId_lu(outh->ih_vid), + (afs_uint32)(outh->ih_ino & NAMEI_VNODEMASK), + (afs_uint32)(outh->ih_ino >> NAMEI_UNIQSHIFT)); rx_Write(m->call, m->line, strlen(m->line)); FDH_REALLYCLOSE(infdP); return EIO;