summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2017-07-03 04:25:28 +0000
committerdelphij <delphij@FreeBSD.org>2017-07-03 04:25:28 +0000
commitb93eff4c864fec9924088fbd05edaecec5ea5beb (patch)
treec92f2d3e9e60504d0cf82df44f98db7f7c5cbd9d
parent25a411b24efa06d93013cbf7dcb34a6e2f2ee5f4 (diff)
downloadFreeBSD-src-b93eff4c864fec9924088fbd05edaecec5ea5beb.zip
FreeBSD-src-b93eff4c864fec9924088fbd05edaecec5ea5beb.tar.gz
MFS r320581: MFC r320494: Fix double free by reverting r300385 and
r300624 which was false positive reported by cppcheck. Approved by: re (kib)
-rw-r--r--lib/libc/rpc/getnetconfig.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
index 40e5a1b..84efd5c 100644
--- a/lib/libc/rpc/getnetconfig.c
+++ b/lib/libc/rpc/getnetconfig.c
@@ -692,7 +692,7 @@ static struct netconfig *
dup_ncp(struct netconfig *ncp)
{
struct netconfig *p;
- char *tmp, *tmp2;
+ char *tmp;
u_int i;
if ((tmp=malloc(MAXNETCONFIGLINE)) == NULL)
@@ -701,7 +701,6 @@ dup_ncp(struct netconfig *ncp)
free(tmp);
return(NULL);
}
- tmp2 = tmp;
/*
* First we dup all the data from matched netconfig buffer. Then we
* adjust some of the member pointer to a pre-allocated buffer where
@@ -723,7 +722,6 @@ dup_ncp(struct netconfig *ncp)
if (p->nc_lookups == NULL) {
free(p->nc_netid);
free(p);
- free(tmp2);
return(NULL);
}
for (i=0; i < p->nc_nlookups; i++) {
OpenPOWER on IntegriCloud