diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-16 07:57:22 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-16 07:57:22 -0200 |
| commit | ad0b136d63d70552782c5c4936ce97e8aa42442e (patch) | |
| tree | 44825d3d4a6cdbed690f2a6d5611f043119188fd /lib/libc/rpc/rpcb_clnt.c | |
| parent | 2e02b14e19fd0fe27055d4a6e11a65e76882bf5f (diff) | |
| parent | d1d4e816ce49797ab1f23bb48cf5ee69018df284 (diff) | |
| download | FreeBSD-src-ad0b136d63d70552782c5c4936ce97e8aa42442e.zip FreeBSD-src-ad0b136d63d70552782c5c4936ce97e8aa42442e.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'lib/libc/rpc/rpcb_clnt.c')
| -rw-r--r-- | lib/libc/rpc/rpcb_clnt.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c index a0d840e..943d7c8 100644 --- a/lib/libc/rpc/rpcb_clnt.c +++ b/lib/libc/rpc/rpcb_clnt.c @@ -183,8 +183,7 @@ delete_cache(addr) free(cptr->ac_netid); free(cptr->ac_taddr->buf); free(cptr->ac_taddr); - if (cptr->ac_uaddr) - free(cptr->ac_uaddr); + free(cptr->ac_uaddr); if (prevptr) prevptr->ac_next = cptr->ac_next; else @@ -222,14 +221,10 @@ add_cache(host, netid, taddr, uaddr) ad_cache->ac_taddr->buf = (char *) malloc(taddr->len); if (ad_cache->ac_taddr->buf == NULL) { out: - if (ad_cache->ac_host) - free(ad_cache->ac_host); - if (ad_cache->ac_netid) - free(ad_cache->ac_netid); - if (ad_cache->ac_uaddr) - free(ad_cache->ac_uaddr); - if (ad_cache->ac_taddr) - free(ad_cache->ac_taddr); + free(ad_cache->ac_host); + free(ad_cache->ac_netid); + free(ad_cache->ac_uaddr); + free(ad_cache->ac_taddr); free(ad_cache); return; } @@ -262,8 +257,7 @@ out: free(cptr->ac_netid); free(cptr->ac_taddr->buf); free(cptr->ac_taddr); - if (cptr->ac_uaddr) - free(cptr->ac_uaddr); + free(cptr->ac_uaddr); if (prevptr) { prevptr->ac_next = NULL; @@ -816,10 +810,8 @@ __rpcb_findaddr_timed(program, version, nconf, host, clpp, tp) malloc(remote.len)) == NULL)) { rpc_createerr.cf_stat = RPC_SYSTEMERROR; clnt_geterr(client, &rpc_createerr.cf_error); - if (address) { - free(address); - address = NULL; - } + free(address); + address = NULL; goto error; } memcpy(address->buf, remote.buf, remote.len); |
