mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-12-03 19:08:58 +00:00
MFC r320494: Fix double free by reverting r300385 and r300624 which was
false positive reported by cppcheck.
This commit is contained in:
parent
442beedbd8
commit
a6ce223346
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/stable/10/; revision=320582
@ -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++) {
|
||||
|
Loading…
Reference in New Issue
Block a user