diff options
author | Toomas Soome <tsoome@me.com> | 2019-01-22 12:04:55 +0200 |
---|---|---|
committer | Toomas Soome <tsoome@me.com> | 2019-07-03 10:34:25 +0300 |
commit | 21f023df5de311466c7fef39e70e23b3551a16d5 (patch) | |
tree | 4ae832b1ede8d3c96a0bee32ec5bf0af3bab1199 /usr/src/lib/cfgadm_plugins/pci/common/cfga.c | |
parent | eb29cb2960e466249344f1ef9a871496cb2a611a (diff) | |
download | illumos-gate-21f023df5de311466c7fef39e70e23b3551a16d5.tar.gz |
11145 cfgadm_plugins: NULL pointer errors
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/lib/cfgadm_plugins/pci/common/cfga.c')
-rw-r--r-- | usr/src/lib/cfgadm_plugins/pci/common/cfga.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/lib/cfgadm_plugins/pci/common/cfga.c b/usr/src/lib/cfgadm_plugins/pci/common/cfga.c index 6826876f6b..39417d1498 100644 --- a/usr/src/lib/cfgadm_plugins/pci/common/cfga.c +++ b/usr/src/lib/cfgadm_plugins/pci/common/cfga.c @@ -1080,7 +1080,7 @@ cfga_private_func(const char *function, const char *ap_id, if ((strncmp(str, func_strs[MODE], len) == 0) && (*(str+(len)) == '=')) { for (str = (str+(++len)), i = 0; - *str != NULL; i++, str++) { + *str != '\0'; i++, str++) { buf[i] = *str; } } @@ -1277,7 +1277,7 @@ find_physical_slot_names(const char *devcomp, struct searcharg *slotarg) if ((root_node = di_init("/", DINFOCPYALL|DINFOPATH)) == DI_NODE_NIL) { DBG(1, ("di_init() failed\n")); - return (NULL); + return (-1); } slotarg->devpath = (char *)devcomp; @@ -1285,7 +1285,7 @@ find_physical_slot_names(const char *devcomp, struct searcharg *slotarg) if ((slotarg->promp = di_prom_init()) == DI_PROM_HANDLE_NIL) { DBG(1, ("di_prom_init() failed\n")); di_fini(root_node); - return (NULL); + return (-1); } (void) di_walk_minor(root_node, "ddi_ctl:attachment_point:pci", |