diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-26 16:45:40 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-07-30 21:24:18 +0300 |
| commit | 053601185d4f955b8a517694e8469c12a90c9c7b (patch) | |
| tree | c5be884c6310542f975283346e9b4004143d9f43 | |
| parent | 9292c78d437d97bc5dd20bc4d6788a79e0661e02 (diff) | |
| download | illumos-joyent-053601185d4f955b8a517694e8469c12a90c9c7b.tar.gz | |
11420 rpcbind: NULL pointer errors
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/cmd/rpcbind/rpcb_stat.c | 6 | ||||
| -rw-r--r-- | usr/src/cmd/rpcbind/rpcbind.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/cmd/rpcbind/rpcb_stat.c b/usr/src/cmd/rpcbind/rpcb_stat.c index ed831505f3..4b998af551 100644 --- a/usr/src/cmd/rpcbind/rpcb_stat.c +++ b/usr/src/cmd/rpcbind/rpcb_stat.c @@ -111,7 +111,7 @@ rpcbs_getaddr(int rtype, rpcprog_t prog, rpcvers_t vers, char *netid, (strcmp(al->netid, netid) == 0)) { (void) rw_unlock(&inf_lock); - if ((uaddr == NULL) || (uaddr[0] == NULL)) + if ((uaddr == NULL) || (uaddr[0] == '\0')) atomic_add_int((uint_t *)&al->failure, 1); else atomic_add_int((uint_t *)&al->success, 1); @@ -138,7 +138,7 @@ rpcbs_getaddr(int rtype, rpcprog_t prog, rpcvers_t vers, char *netid, al->prog = prog; al->vers = vers; al->netid = nconf->nc_netid; - if ((uaddr == NULL) || (uaddr[0] == NULL)) { + if ((uaddr == NULL) || (uaddr[0] == '\0')) { al->failure = 1; al->success = 0; } else { @@ -154,7 +154,7 @@ rpcbs_getaddr(int rtype, rpcprog_t prog, rpcvers_t vers, char *netid, free(al); - if ((uaddr == NULL) || (uaddr[0] == NULL)) + if ((uaddr == NULL) || (uaddr[0] == '\0')) atomic_add_int((uint_t *)&wal->failure, 1); else atomic_add_int((uint_t *)&wal->success, 1); diff --git a/usr/src/cmd/rpcbind/rpcbind.c b/usr/src/cmd/rpcbind/rpcbind.c index 694e4f942f..cf763d978e 100644 --- a/usr/src/cmd/rpcbind/rpcbind.c +++ b/usr/src/cmd/rpcbind/rpcbind.c @@ -312,7 +312,7 @@ main(int argc, char *argv[]) ipv6flag = Is_ipv6present(); rpcb_check_init(); - nc_handle = setnetconfig(); /* open netconfig file */ + nc_handle = setnetconfig(); /* open netconfig file */ if (nc_handle == NULL) { syslog(LOG_ERR, "could not read /etc/netconfig"); exit(1); @@ -323,8 +323,8 @@ main(int argc, char *argv[]) } endnetconfig(nc_handle); - if ((loopback_dg[0] == NULL) && (loopback_vc[0] == NULL) && - (loopback_vc_ord[0] == NULL)) { + if ((loopback_dg[0] == '\0') && (loopback_vc[0] == '\0') && + (loopback_vc_ord[0] == '\0')) { syslog(LOG_ERR, "could not find loopback transports"); exit(1); } @@ -617,7 +617,7 @@ init_transport(struct netconfig *nconf) PMAPLIST *pml; if (!svc_register(my_xprt, PMAPPROG, PMAPVERS, - pmap_service, NULL)) { + pmap_service, 0)) { syslog(LOG_ERR, "could not register on %s", nconf->nc_netid); goto error; |