d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a null-pointer dereference and a tautological check in cam_get_device

Browse Source 
Reported by:	Coverity
CID:		1017964
MFC after:	3 weeks
Sponsored by:	Spectra Logic Corp
Differential Revision:	https://reviews.freebsd.org/D13184
This commit is contained in:
asomers 2017-12-06 23:24:11 +00:00
parent e3a601760b
commit 08d7b0184a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libcam/camlib.c
View File

@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/param.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
@ -132,6 +133,9 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
* it so we don't hose the user's string.
*/
newpath = (char *)strdup(path);
if (newpath == NULL)
return (-1);
tmpstr = newpath;
/*
@ -140,8 +144,9 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
if (*tmpstr == '/') {
tmpstr2 = tmpstr;
tmpstr = strrchr(tmpstr2, '/');
if ((tmpstr != NULL) && (*tmpstr != '\0'))
tmpstr++;
/* We know that tmpstr2 contains a '/', so strrchr can't fail */
assert(tmpstr != NULL && *tmpstr != '\0');
tmpstr++;
}
if (*tmpstr == '\0') {