From owner-svn-src-all@FreeBSD.ORG  Tue Jul 16 07:26:47 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4D2A1E75;
 Tue, 16 Jul 2013 07:26:47 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4004A2D7;
 Tue, 16 Jul 2013 07:26:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6G7QliN045680;
 Tue, 16 Jul 2013 07:26:47 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6G7QlwE045679;
 Tue, 16 Jul 2013 07:26:47 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201307160726.r6G7QlwE045679@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 16 Jul 2013 07:26:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253380 - head/lib/libc/stdlib
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jul 2013 07:26:47 -0000

Author: avg
Date: Tue Jul 16 07:26:46 2013
New Revision: 253380
URL: http://svnweb.freebsd.org/changeset/base/253380

Log:
  libc: name passed into __setenv is not necessarily NUL-terminated
  
  That's particularly true when __setenv is called from __merge_environ.
  
  MFC after:	4 days

Modified:
  head/lib/libc/stdlib/getenv.c

Modified: head/lib/libc/stdlib/getenv.c
==============================================================================
--- head/lib/libc/stdlib/getenv.c	Tue Jul 16 06:50:22 2013	(r253379)
+++ head/lib/libc/stdlib/getenv.c	Tue Jul 16 07:26:46 2013	(r253380)
@@ -505,7 +505,7 @@ __setenv(const char *name, size_t nameLe
 		envVars[envNdx].valueSize = valueLen;
 
 		/* Save name of name/value pair. */
-		env = stpcpy(envVars[envNdx].name, name);
+		env = stpncpy(envVars[envNdx].name, name, nameLen);
 		if ((envVars[envNdx].name)[nameLen] != '=')
 			env = stpcpy(env, "=");
 	}