diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-22 14:20:19 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-07-03 10:41:57 +0300 |
| commit | bd401f0568e6905bc051763ff8342d11c17bf032 (patch) | |
| tree | 04b672d087ee37129a387a9635bd0ab71d85415f /usr/src/lib/libdiskmgt/common/entry.c | |
| parent | 5cc5d5cece01c2151c34ac6d97b0bd369aded9ed (diff) | |
| download | illumos-joyent-bd401f0568e6905bc051763ff8342d11c17bf032.tar.gz | |
11159 libdiskmgt: NULL pointer errors
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/lib/libdiskmgt/common/entry.c')
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/entry.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/usr/src/lib/libdiskmgt/common/entry.c b/usr/src/lib/libdiskmgt/common/entry.c index e64e61ef65..425255ae45 100644 --- a/usr/src/lib/libdiskmgt/common/entry.c +++ b/usr/src/lib/libdiskmgt/common/entry.c @@ -69,7 +69,7 @@ dm_free_descriptor(dm_descriptor_t desc) { descriptor_t *dp; - if (desc == NULL) { + if (desc == 0) { return; } dp = (descriptor_t *)(uintptr_t)desc; @@ -253,7 +253,7 @@ dm_get_attributes(dm_descriptor_t desc, int *errp) dm_descriptor_t dm_get_descriptor_by_name(dm_desc_type_t desc_type, char *name, int *errp) { - dm_descriptor_t desc = NULL; + dm_descriptor_t desc = 0; cache_wlock(); @@ -516,7 +516,7 @@ dm_get_slices(char *drive, dm_descriptor_t **slices, int *errp) * values will be NULL if an error occured in these calls. */ - if (alias != NULL) { + if (alias != 0) { disk = dm_get_associated_descriptors(alias, DM_DRIVE, errp); dm_free_descriptor(alias); if (disk != NULL) { @@ -551,9 +551,8 @@ dm_get_slice_stats(char *slice, nvlist_t **dev_stats, int *errp) * values will be NULL if an error occured in these calls. */ devp = dm_get_descriptor_by_name(DM_SLICE, slice, errp); - if (devp != NULL) { - *dev_stats = dm_get_stats(devp, DM_SLICE_STAT_USE, - errp); + if (devp != 0) { + *dev_stats = dm_get_stats(devp, DM_SLICE_STAT_USE, errp); dm_free_descriptor(devp); } } @@ -566,7 +565,7 @@ dm_get_slice_stats(char *slice, nvlist_t **dev_stats, int *errp) int dm_isoverlapping(char *slicename, char **overlaps_with, int *errp) { - dm_descriptor_t slice = NULL; + dm_descriptor_t slice = 0; dm_descriptor_t *media = NULL; dm_descriptor_t *slices = NULL; int i = 0; @@ -580,7 +579,7 @@ dm_isoverlapping(char *slicename, char **overlaps_with, int *errp) int ret = 0; slice = dm_get_descriptor_by_name(DM_SLICE, slicename, errp); - if (slice == NULL) + if (slice == 0) goto out; /* @@ -588,11 +587,11 @@ dm_isoverlapping(char *slicename, char **overlaps_with, int *errp) * associated slices. */ media = dm_get_associated_descriptors(slice, DM_MEDIA, errp); - if (media == NULL || *media == NULL || *errp != 0) + if (media == NULL || *media == 0 || *errp != 0) goto out; slices = dm_get_associated_descriptors(*media, DM_SLICE, errp); - if (slices == NULL || *slices == NULL || *errp != 0) + if (slices == NULL || *slices == 0 || *errp != 0) goto out; media_attrs = dm_get_attributes(*media, errp); |