From owner-svn-src-stable@FreeBSD.ORG  Wed Jul 24 08:57:00 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2F647FC1;
 Wed, 24 Jul 2013 08:57:00 +0000 (UTC) (envelope-from avg@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 203D32335;
 Wed, 24 Jul 2013 08:57:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6O8ux5k086070;
 Wed, 24 Jul 2013 08:56:59 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6O8uxpq086069;
 Wed, 24 Jul 2013 08:56:59 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201307240856.r6O8uxpq086069@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 24 Jul 2013 08:56:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r253600 - stable/8/lib/libc/stdlib
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jul 2013 08:57:00 -0000

Author: avg
Date: Wed Jul 24 08:56:59 2013
New Revision: 253600
URL: http://svnweb.freebsd.org/changeset/base/253600

Log:
  MFC r253380,253413: name passed into __setenv is not necessarily NUL-terminated

Modified:
  stable/8/lib/libc/stdlib/getenv.c
Directory Properties:
  stable/8/lib/libc/   (props changed)

Modified: stable/8/lib/libc/stdlib/getenv.c
==============================================================================
--- stable/8/lib/libc/stdlib/getenv.c	Wed Jul 24 08:39:09 2013	(r253599)
+++ stable/8/lib/libc/stdlib/getenv.c	Wed Jul 24 08:56:59 2013	(r253600)
@@ -504,9 +504,8 @@ __setenv(const char *name, size_t nameLe
 		envVars[envNdx].valueSize = valueLen;
 
 		/* Save name of name/value pair. */
-		env = stpcpy(envVars[envNdx].name, name);
-		if ((envVars[envNdx].name)[nameLen] != '=')
-			env = stpcpy(env, "=");
+		env = stpncpy(envVars[envNdx].name, name, nameLen);
+		*env++ = '=';
 	}
 	else
 		env = envVars[envNdx].value;