From 0e367d2eb72e1ea80c04378d837468e0cbaf1a7e 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. Reviewed-on: http://gerrit.openafs.org/8878 Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 5c5515a5c3b34f9a115b29378e123c779c138f51) Change-Id: I73de73f8cd9be9d106285f45e86e030909293521 Reviewed-on: http://gerrit.openafs.org/9512 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Andrew Deason Reviewed-by: Stephan Wiesand --- 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 d486e2487..0306d5fd6 100644 --- a/src/volser/vol_split.c +++ b/src/volser/vol_split.c @@ -257,9 +257,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 %u.%u.%u\n", - infdP->fd_ih->ih_vid, - (afs_uint32)(infdP->fd_ih->ih_ino & NAMEI_VNODEMASK), - (afs_uint32)(infdP->fd_ih->ih_ino >> NAMEI_UNIQSHIFT)); + 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; } @@ -275,9 +275,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 %u.%u.%u\n", - outfdP->fd_ih->ih_vid, - (afs_uint32)(outfdP->fd_ih->ih_ino & NAMEI_VNODEMASK), - (afs_uint32)(outfdP->fd_ih->ih_ino >> NAMEI_UNIQSHIFT)); + 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; -- 2.39.5