summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2017-07-03 02:11:14 +0000
committerdelphij <delphij@FreeBSD.org>2017-07-03 02:11:14 +0000
commit645bfffaa84ffbc02b2889875ebc33677dc7ba1f (patch)
tree5ef091b23ce696e50f8f7aa5e5004da97f1ca705 /lib
parent05df363aa5e4997e3018682e02a8a55daf936e8e (diff)
downloadFreeBSD-src-645bfffaa84ffbc02b2889875ebc33677dc7ba1f.zip
FreeBSD-src-645bfffaa84ffbc02b2889875ebc33677dc7ba1f.tar.gz
MFC r320494: Fix double free by reverting r300385 and r300624 which was
false positive reported by cppcheck. releng/11.1 candidate.
Diffstat (limited to 'lib')
-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