diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-22 14:04:00 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-06-25 23:29:33 +0300 |
| commit | 47f78bf40e94882d167f6132e5dc25ffed0be6e5 (patch) | |
| tree | f46136a69f871ff6c3c74dd00f7966f688f654f4 /usr | |
| parent | e2e372a44e0036831b4a1b5f80a7c680223275fa (diff) | |
| download | illumos-joyent-47f78bf40e94882d167f6132e5dc25ffed0be6e5.tar.gz | |
11157 libbe: NULL pointer errors
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/lib/libbe/common/be_create.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libbe/common/be_utils.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/lib/libbe/common/be_create.c b/usr/src/lib/libbe/common/be_create.c index 6aea6e4112..791d678302 100644 --- a/usr/src/lib/libbe/common/be_create.c +++ b/usr/src/lib/libbe/common/be_create.c @@ -2836,7 +2836,7 @@ be_get_snap(char *origin, char **snap) */ cp = strrchr(origin, '@'); if (cp != NULL) { - if (cp[1] != NULL && cp[1] != '\0') { + if (cp[1] != '\0') { cp[0] = '\0'; *snap = cp+1; } else { diff --git a/usr/src/lib/libbe/common/be_utils.c b/usr/src/lib/libbe/common/be_utils.c index 73eb416043..72b41b3315 100644 --- a/usr/src/lib/libbe/common/be_utils.c +++ b/usr/src/lib/libbe/common/be_utils.c @@ -2318,7 +2318,7 @@ be_update_zone_vfstab(zfs_handle_t *zhp, char *be_name, char *old_rc_loc, char * be_auto_snap_name(void) { - time_t utc_tm = NULL; + time_t utc_tm = 0; struct tm *gmt_tm = NULL; char gmt_time_str[64]; char *auto_snap_name = NULL; @@ -2505,7 +2505,7 @@ be_valid_auto_snap_name(char *name) } /* Get the next field, which is the reserved field. */ - if (c[1] == NULL || c[1] == '\0') { + if (c[1] == '\0') { free(policy); return (B_FALSE); } @@ -2524,7 +2524,7 @@ be_valid_auto_snap_name(char *name) } /* The remaining string should be the date field */ - if (c[1] == NULL || c[1] == '\0') { + if (c[1] == '\0') { free(policy); return (B_FALSE); } |