diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-24 15:42:07 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-07-11 18:32:37 +0300 |
| commit | 142d813a06c6f9a6142e2c276b62129a17a31a65 (patch) | |
| tree | 4142a753f8c42cc961081a00e48b86be54804c46 /usr/src/cmd/getent | |
| parent | 4d7452f8473ff4636be68c3aa2ec185d6aa00315 (diff) | |
| download | illumos-joyent-142d813a06c6f9a6142e2c276b62129a17a31a65.tar.gz | |
11339 getent: NULL pointer errors
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Sebastian Wiedenroth <sebastian.wiedenroth@skylime.net>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/getent')
| -rw-r--r-- | usr/src/cmd/getent/dogetserv.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr/src/cmd/getent/dogetserv.c b/usr/src/cmd/getent/dogetserv.c index dd37e36100..cfc9996b19 100644 --- a/usr/src/cmd/getent/dogetserv.c +++ b/usr/src/cmd/getent/dogetserv.c @@ -19,7 +19,6 @@ * * CDDL HEADER END */ -#ident "%Z%%M% %I% %E% SMI" /* * Copyright (c) 1994, by Sun Microsystems, Inc. @@ -46,7 +45,7 @@ putservent(const struct servent *sp, FILE *fp) } if (fprintf(fp, "%-20s %d/%s", - sp->s_name, ntohs(sp->s_port), sp->s_proto) == EOF) + sp->s_name, ntohs(sp->s_port), sp->s_proto) == EOF) rc = 1; for (p = sp->s_aliases; *p != 0; p++) { if (fprintf(fp, " %s", *p) == EOF) @@ -83,10 +82,10 @@ dogetserv(const char **list) /* Copy string to avoiding modifying the argument */ (void) strncpy(key, *list, sizeof (key)); - key[sizeof (key) - 1] = NULL; + key[sizeof (key) - 1] = '\0'; /* Split at a '/' to extract protocol number */ if ((cp = strchr(key, '/')) != NULL) { - *cp = NULL; + *cp = '\0'; protocol = cp + 1; } port = htons(atoi(key)); |