d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plugged memory leakage in some erroneous cases

Browse Source 
Obtained from:	KAME
MFC after:	1 week
This commit is contained in:
Hajimu UMEMOTO 2002-10-31 19:45:48 +00:00
parent bc96e1c7cf
commit 35f6695bb2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=106259
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netinet6/ip6_output.c
View File

@ -1781,10 +1781,10 @@ ip6_pcbopts(pktopt, m, so, sopt)
if (!m || m->m_len == 0) {
/*
* Only turning off any previous options.
* Only turning off any previous options, regardless of
* whether the opt is just created or given.
*/
if (opt)
free(opt, M_IP6OPT);
free(opt, M_IP6OPT);
return(0);
}
@ -1793,6 +1793,7 @@ ip6_pcbopts(pktopt, m, so, sopt)
priv = 1;
if ((error = ip6_setpktoptions(m, opt, priv, 1)) != 0) {
ip6_clearpktopts(opt, 1, -1); /* XXX: discard all options */
free(opt, M_IP6OPT);
return(error);
}
*pktopt = opt;
@ -1884,7 +1885,7 @@ ip6_copypktopts(src, canwait)
dst = malloc(sizeof(*dst), M_IP6OPT, canwait);
if (dst == NULL && canwait == M_NOWAIT)
goto bad;
return (NULL);
bzero(dst, sizeof(*dst));
dst->ip6po_hlim = src->ip6po_hlim;
@ -1910,13 +1911,13 @@ ip6_copypktopts(src, canwait)
return(dst);
bad:
printf("ip6_copypktopts: copy failed");
if (dst->ip6po_pktinfo) free(dst->ip6po_pktinfo, M_IP6OPT);
if (dst->ip6po_nexthop) free(dst->ip6po_nexthop, M_IP6OPT);
if (dst->ip6po_hbh) free(dst->ip6po_hbh, M_IP6OPT);
if (dst->ip6po_dest1) free(dst->ip6po_dest1, M_IP6OPT);
if (dst->ip6po_dest2) free(dst->ip6po_dest2, M_IP6OPT);
if (dst->ip6po_rthdr) free(dst->ip6po_rthdr, M_IP6OPT);
free(dst, M_IP6OPT);
return(NULL);
}
#undef PKTOPT_EXTHDRCPY