Date: Mon, 3 Jul 2017 02:11:14 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r320581 - stable/11/lib/libc/rpc Message-ID: <201707030211.v632BEu8033448@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon Jul 3 02:11:14 2017 New Revision: 320581 URL: https://svnweb.freebsd.org/changeset/base/320581 Log: MFC r320494: Fix double free by reverting r300385 and r300624 which was false positive reported by cppcheck. releng/11.1 candidate. Modified: stable/11/lib/libc/rpc/getnetconfig.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/rpc/getnetconfig.c ============================================================================== --- stable/11/lib/libc/rpc/getnetconfig.c Mon Jul 3 02:01:16 2017 (r320580) +++ stable/11/lib/libc/rpc/getnetconfig.c Mon Jul 3 02:11:14 2017 (r320581) @@ -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?201707030211.v632BEu8033448>