jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 15:30:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

volser/vol_split.c: do not dereference known-NULL pointer

Browse Source 
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 <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
This commit is contained in:
Nickolai Zeldovich 2013-01-05 23:44:33 -05:00 committed by Derrick Brashear
parent 4042667388
commit 5c5515a5c3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/volser/vol_split.c
View File

@ -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;