c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 02:49:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

cppcheck: (warning) Possible null pointer dereference: nvh

Browse Source 
Move the 'nvh = (void *)buf' assignment after the 'buf == NULL'
check to resolve the warning.  Interestingly, cppcheck 1.88
correctly determines that the existing code is safe, while
cppcheck 1.86 reports the warning.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #9732
This commit is contained in:
Brian Behlendorf 2019-12-16 16:03:31 -08:00 committed by Tony Hutter
parent 180c41e0b7
commit 9791683901
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/nvpair/nvpair.c
View File

@ -2558,7 +2558,7 @@ nvlist_common(nvlist_t *nvl, char *buf, size_t *buflen, int encoding,
#else #else
int host_endian = 0; int host_endian = 0;
#endif /* _LITTLE_ENDIAN */ #endif /* _LITTLE_ENDIAN */
nvs_header_t *nvh = (void *)buf; nvs_header_t *nvh;
if (buflen == NULL || nvl == NULL || if (buflen == NULL || nvl == NULL ||
(nvs.nvs_priv = (nvpriv_t *)(uintptr_t)nvl->nvl_priv) == NULL) (nvs.nvs_priv = (nvpriv_t *)(uintptr_t)nvl->nvl_priv) == NULL)
@ -2577,6 +2577,7 @@ nvlist_common(nvlist_t *nvl, char *buf, size_t *buflen, int encoding,
if (buf == NULL || *buflen < sizeof (nvs_header_t)) if (buf == NULL || *buflen < sizeof (nvs_header_t))
return (EINVAL); return (EINVAL);
nvh = (void *)buf;
nvh->nvh_encoding = encoding; nvh->nvh_encoding = encoding;
nvh->nvh_endian = nvl_endian = host_endian; nvh->nvh_endian = nvl_endian = host_endian;
nvh->nvh_reserved1 = 0; nvh->nvh_reserved1 = 0;
@ -2588,6 +2589,7 @@ nvlist_common(nvlist_t *nvl, char *buf, size_t *buflen, int encoding,
return (EINVAL); return (EINVAL);
/* get method of encoding from first byte */ /* get method of encoding from first byte */
nvh = (void *)buf;
encoding = nvh->nvh_encoding; encoding = nvh->nvh_encoding;
nvl_endian = nvh->nvh_endian; nvl_endian = nvh->nvh_endian;
break; break;