From owner-svn-src-head@FreeBSD.ORG  Fri Feb 20 01:02:34 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 40FE59A4;
 Fri, 20 Feb 2015 01:02:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2C09CF7;
 Fri, 20 Feb 2015 01:02:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1K12X30014213;
 Fri, 20 Feb 2015 01:02:33 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1K12X3l014211;
 Fri, 20 Feb 2015 01:02:33 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201502200102.t1K12X3l014211@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Fri, 20 Feb 2015 01:02:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279035 - head/lib/libc/gen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Feb 2015 01:02:34 -0000

Author: pfg
Date: Fri Feb 20 01:02:32 2015
New Revision: 279035
URL: https://svnweb.freebsd.org/changeset/base/279035

Log:
  Fix small memleaks in nis_passwd() and nis_group().
  
  These only occur upon error.
  
  Code Review:	https://reviews.freebsd.org/D1849
  Reviewed by:	delphij
  
  CID:	1016715
  CID:	1016717

Modified:
  head/lib/libc/gen/getgrent.c
  head/lib/libc/gen/getpwent.c

Modified: head/lib/libc/gen/getgrent.c
==============================================================================
--- head/lib/libc/gen/getgrent.c	Fri Feb 20 00:55:38 2015	(r279034)
+++ head/lib/libc/gen/getgrent.c	Fri Feb 20 01:02:32 2015	(r279035)
@@ -1173,8 +1173,10 @@ nis_group(void *retval, void *mdata, va_
 		 * terminator, alignment padding, and one (char *)
 		 * pointer for the member list terminator.
 		 */
-		if (resultlen >= bufsize - _ALIGNBYTES - sizeof(char *))
+		if (resultlen >= bufsize - _ALIGNBYTES - sizeof(char *)) {
+			free(result);
 			goto erange;
+		}
 		memcpy(buffer, result, resultlen);
 		buffer[resultlen] = '\0';
 		free(result);

Modified: head/lib/libc/gen/getpwent.c
==============================================================================
--- head/lib/libc/gen/getpwent.c	Fri Feb 20 00:55:38 2015	(r279034)
+++ head/lib/libc/gen/getpwent.c	Fri Feb 20 01:02:32 2015	(r279035)
@@ -1392,8 +1392,10 @@ nis_passwd(void *retval, void *mdata, va
 				continue;
 			}
 		}
-		if (resultlen >= bufsize)
+		if (resultlen >= bufsize) {
+			free(result);
 			goto erange;
+		}
 		memcpy(buffer, result, resultlen);
 		buffer[resultlen] = '\0';
 		free(result);