[src/trunk]: src/lib/libc/rpc Revert previous since it causes a double free (...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c45196c1fb7c
branches:  trunk
changeset: 825119:c45196c1fb7c
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jun 30 10:03:34 2017 +0000

description:
Revert previous since it causes a double free (p->nc_netid == tmp == tmp2).
>From Xin Li @ FreeBSD.
XXX: pullup 7

diffstat:

 lib/libc/rpc/getnetconfig.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 3c295c4f7f2f -r c45196c1fb7c lib/libc/rpc/getnetconfig.c
--- a/lib/libc/rpc/getnetconfig.c       Fri Jun 30 09:19:19 2017 +0000
+++ b/lib/libc/rpc/getnetconfig.c       Fri Jun 30 10:03:34 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getnetconfig.c,v 1.24 2016/10/26 15:39:30 christos Exp $       */
+/*     $NetBSD: getnetconfig.c,v 1.25 2017/06/30 10:03:34 christos Exp $       */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -36,7 +36,7 @@
 #if 0
 static        char sccsid[] = "@(#)getnetconfig.c      1.12 91/12/19 SMI";
 #else
-__RCSID("$NetBSD: getnetconfig.c,v 1.24 2016/10/26 15:39:30 christos Exp $");
+__RCSID("$NetBSD: getnetconfig.c,v 1.25 2017/06/30 10:03:34 christos Exp $");
 #endif
 #endif
 
@@ -649,12 +649,12 @@
 dup_ncp(struct netconfig *ncp)
 {
        struct netconfig        *p;
-       char    *tmp, *tmp2;
+       char    *tmp;
        u_int   i;
 
        _DIAGASSERT(ncp != NULL);
 
-       if ((tmp2 = tmp = malloc(MAXNETCONFIGLINE)) == NULL)
+       if ((tmp = malloc(MAXNETCONFIGLINE)) == NULL)
                return NULL;
        if ((p = malloc(sizeof(*p))) == NULL) {
                free(tmp);
@@ -679,7 +679,6 @@
        p->nc_device = strcpy(tmp, ncp->nc_device);
        p->nc_lookups = calloc((size_t)(p->nc_nlookups + 1), sizeof(char *));
        if (p->nc_lookups == NULL) {
-               free(tmp2);
                free(p->nc_netid);
                free(p);
                return NULL;