Fix coverity defects: CID 147511, 147513

CID 147511: Type:Dereference before null check
CID 147513: Type:Dereference before null check

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: cao.xuewen <cao.xuewen@zte.com.cn>
Closes #5306

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 7a0f55f75e9b6b16c91af227e6f3050279ffde7a..b9b0b29bca618d5099754a33c935955a272dc93b 100644 (file)
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -3290,7 +3290,7 @@ zdb_vdev_lookup(vdev_t *vdev, char *path)
                return (NULL);
 
        vdev = vdev->vdev_child[i];
-       if (*s == '\0')
+       if (s && *s == '\0')
                return (vdev);
        return (zdb_vdev_lookup(vdev, s+1));
 

diff --git a/lib/libshare/nfs.c b/lib/libshare/nfs.c
index 58b4c8880400b4203cfcbb2f2ee8d8ee126c4185..9d548dccc5831561978a90a9b41139cd10c55f13 100644 (file)
--- a/lib/libshare/nfs.c
+++ b/lib/libshare/nfs.c
@@ -532,8 +532,10 @@ nfs_is_share_active(sa_share_impl_t impl_share)
 
        nfs_exportfs_temp_fp = fdopen(fd, "r");
 
-       if (nfs_exportfs_temp_fp == NULL ||
-           fseek(nfs_exportfs_temp_fp, 0, SEEK_SET) < 0) {
+       if (nfs_exportfs_temp_fp == NULL)
+               return (B_FALSE);
+
+       if (fseek(nfs_exportfs_temp_fp, 0, SEEK_SET) < 0) {
                fclose(nfs_exportfs_temp_fp);
                return (B_FALSE);
        }