summaryrefslogtreecommitdiffstats
path: root/lib/libefi
diff options
context:
space:
mode:
authorGvozden Neskovic <[email protected]>2016-07-19 18:24:24 +0200
committerBrian Behlendorf <[email protected]>2016-07-27 13:31:22 -0700
commita64f903b06e9135c07f20bc6f8196e2879d2cf57 (patch)
tree0e96a7a6c5789b4ca4abc0c287e11a9474275660 /lib/libefi
parent25458cbef9e59ef9ee6a7e729ab2522ed308f88f (diff)
Fixes for issues found with cppcheck tool
The patch fixes small number of errors/false positives reported by `cppcheck`, static analysis tool for C/C++. cppcheck 1.72 $ cppcheck . --force --quiet [cmd/zfs/zfs_main.c:4444]: (error) Possible null pointer dereference: who_perm [cmd/zfs/zfs_main.c:4445]: (error) Possible null pointer dereference: who_perm [cmd/zfs/zfs_main.c:4446]: (error) Possible null pointer dereference: who_perm [cmd/zpool/zpool_iter.c:317]: (error) Uninitialized variable: nvroot [cmd/zpool/zpool_vdev.c:1526]: (error) Memory leak: child [lib/libefi/rdwr_efi.c:1118]: (error) Memory leak: efi_label [lib/libuutil/uu_misc.c:207]: (error) va_list 'args' was opened but not closed by va_end(). [lib/libzfs/libzfs_import.c:1554]: (error) Dangerous usage of 'diskname' (strncpy doesn't always null-terminate it). [lib/libzfs/libzfs_sendrecv.c:3279]: (error) Dereferencing 'cp' after it is deallocated / released [tests/zfs-tests/cmd/file_write/file_write.c:154]: (error) Possible null pointer dereference: operation [tests/zfs-tests/cmd/randfree_file/randfree_file.c:90]: (error) Memory leak: buf [cmd/zinject/zinject.c:1068]: (error) Uninitialized variable: dataset [module/icp/io/sha2_mod.c:698]: (error) Uninitialized variable: blocks_per_int64 Signed-off-by: Gvozden Neskovic <[email protected]> Signed-off-by: Chunwei Chen <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #1392
Diffstat (limited to 'lib/libefi')
-rw-r--r--lib/libefi/rdwr_efi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index 7a7a4b4b7..e9fb15ee2 100644
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -1106,7 +1106,7 @@ check_input(struct dk_gpt *vtoc)
int
efi_use_whole_disk(int fd)
{
- struct dk_gpt *efi_label;
+ struct dk_gpt *efi_label = NULL;
int rval;
int i;
uint_t resv_index = 0, data_index = 0;
@@ -1115,6 +1115,8 @@ efi_use_whole_disk(int fd)
rval = efi_alloc_and_read(fd, &efi_label);
if (rval < 0) {
+ if (efi_label != NULL)
+ efi_free(efi_label);
return (rval);
}