Date: Mon, 3 Jul 2017 04:25:28 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320584 - releng/11.1/lib/libc/rpc Message-ID: <201707030425.v634PSuF087005@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon Jul 3 04:25:28 2017 New Revision: 320584 URL: https://svnweb.freebsd.org/changeset/base/320584 Log: MFS r320581: MFC r320494: Fix double free by reverting r300385 and r300624 which was false positive reported by cppcheck. Approved by: re (kib) Modified: releng/11.1/lib/libc/rpc/getnetconfig.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/lib/libc/rpc/getnetconfig.c ============================================================================== --- releng/11.1/lib/libc/rpc/getnetconfig.c Mon Jul 3 02:18:10 2017 (r320583) +++ releng/11.1/lib/libc/rpc/getnetconfig.c Mon Jul 3 04:25:28 2017 (r320584) @@ -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++) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707030425.v634PSuF087005>