diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-21 20:33:24 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-06-24 21:34:57 +0300 |
| commit | f21450b8fa7a1530d48dc06401e691df1b8965fa (patch) | |
| tree | 5b85c667c86b70529f571400bbb51f9fbda273e9 /usr/src/lib/libadm | |
| parent | 5f060f5100426465bddc18c6f81b146ccee30eb8 (diff) | |
| download | illumos-gate-f21450b8fa7a1530d48dc06401e691df1b8965fa.tar.gz | |
11121 libadm: NULL pointer errors
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libadm')
| -rw-r--r-- | usr/src/lib/libadm/common/ckdate.c | 9 | ||||
| -rw-r--r-- | usr/src/lib/libadm/common/pkgparam.c | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/usr/src/lib/libadm/common/ckdate.c b/usr/src/lib/libadm/common/ckdate.c index 9ae38509e1..43b5582ed6 100644 --- a/usr/src/lib/libadm/common/ckdate.c +++ b/usr/src/lib/libadm/common/ckdate.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* @@ -299,7 +299,7 @@ int ckdate_val(char *fmt, char *input) { char ltrl, dfl; - int valid = 1; /* time of day string is valid for format */ + int valid = 1; /* time of day string is valid for format */ if ((fmt != NULL) && (fmtcheck(fmt) == 1)) return (4); @@ -392,9 +392,8 @@ ckdate_val(char *fmt, char *input) fmt++; } /* end of while fmt and valid */ - if ((*fmt == NULL) && ((input != NULL) && *input != 0)) { - if (*input != NULL) - valid = 0; + if ((*fmt == '\0') && ((input != NULL) && *input != '\0')) { + valid = 0; } return ((valid == 0)); } diff --git a/usr/src/lib/libadm/common/pkgparam.c b/usr/src/lib/libadm/common/pkgparam.c index cd7cacfd27..393298f29f 100644 --- a/usr/src/lib/libadm/common/pkgparam.c +++ b/usr/src/lib/libadm/common/pkgparam.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. @@ -52,7 +52,7 @@ #define ESCAPE '\\' static char sepset[] = ":=\n"; -static char qset[] = "'\""; +static char qset[] = "'\""; static char *pkg_inst_root = NULL; char *pkgdir = NULL; @@ -368,8 +368,8 @@ pkgparam(char *pkg, char *param) } if (pt = fpkgparam(fp, param)) { - if (strcmp(param, "ARCH") == NULL || - strcmp(param, "CATEGORY") == NULL) { + if (strcmp(param, "ARCH") == 0 || + strcmp(param, "CATEGORY") == 0) { /* remove all whitespace from value */ value = copy = pt; while (*value) { @@ -411,7 +411,7 @@ set_PKGpaths(char *path) char * get_PKGLOC(void) { - if (Adm_pkgloc[0] == NULL) + if (Adm_pkgloc[0] == '\0') return (PKGLOC); else return (Adm_pkgloc); @@ -420,7 +420,7 @@ get_PKGLOC(void) char * get_PKGADM(void) { - if (Adm_pkgadm[0] == NULL) + if (Adm_pkgadm[0] == '\0') return (PKGADM); else return (Adm_pkgadm); |