From owner-svn-src-stable-7@FreeBSD.ORG  Tue Jan 19 16:58:51 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 35E341065676;
	Tue, 19 Jan 2010 16:58:51 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 24F728FC1A;
	Tue, 19 Jan 2010 16:58:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0JGwpFo051608;
	Tue, 19 Jan 2010 16:58:51 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0JGwppk051606;
	Tue, 19 Jan 2010 16:58:51 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201001191658.o0JGwppk051606@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Tue, 19 Jan 2010 16:58:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202631 - stable/7/lib/libc/rpc
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jan 2010 16:58:51 -0000

Author: brueffer
Date: Tue Jan 19 16:58:50 2010
New Revision: 202631
URL: http://svn.freebsd.org/changeset/base/202631

Log:
  MFC: r201603
  
  Fix a double free().

Modified:
  stable/7/lib/libc/rpc/getnetpath.c
Directory Properties:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/stdtime/   (props changed)

Modified: stable/7/lib/libc/rpc/getnetpath.c
==============================================================================
--- stable/7/lib/libc/rpc/getnetpath.c	Tue Jan 19 16:51:51 2010	(r202630)
+++ stable/7/lib/libc/rpc/getnetpath.c	Tue Jan 19 16:58:50 2010	(r202631)
@@ -101,7 +101,7 @@ setnetpath()
     if ((np_sessionp->nc_handlep = setnetconfig()) == NULL) {
 	free(np_sessionp);
 	syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-	goto failed;
+    	return (NULL);
     }
     np_sessionp->valid = NP_VALID;
     np_sessionp->ncp_list = NULL;