From owner-svn-src-all@FreeBSD.ORG  Wed Jul 17 08:45:27 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 9B8ABA8A;
 Wed, 17 Jul 2013 08:45:27 +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 8E930D65;
 Wed, 17 Jul 2013 08:45:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6H8jRqv008308;
 Wed, 17 Jul 2013 08:45:27 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6H8jRfA008307;
 Wed, 17 Jul 2013 08:45:27 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201307170845.r6H8jRfA008307@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 17 Jul 2013 08:45:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253413 - 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: Wed, 17 Jul 2013 08:45:27 -0000

Author: avg
Date: Wed Jul 17 08:45:27 2013
New Revision: 253413
URL: http://svnweb.freebsd.org/changeset/base/253413

Log:
  [fix to r253380] __setenv: be explicit about placing '=' after name
  
  This should a regression introduced in r253380 if malloc'ed memory
  happens to have '=' at the right place.
  
  Reported by:	ache
  Pointyhat to:	me (avg)
  MFC after:	1 day
  X-MFC with:	r253380

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

Modified: head/lib/libc/stdlib/getenv.c
==============================================================================
--- head/lib/libc/stdlib/getenv.c	Wed Jul 17 07:17:07 2013	(r253412)
+++ head/lib/libc/stdlib/getenv.c	Wed Jul 17 08:45:27 2013	(r253413)
@@ -506,8 +506,7 @@ __setenv(const char *name, size_t nameLe
 
 		/* Save name of name/value pair. */
 		env = stpncpy(envVars[envNdx].name, name, nameLen);
-		if ((envVars[envNdx].name)[nameLen] != '=')
-			env = stpcpy(env, "=");
+		*env++ = '=';
 	}
 	else
 		env = envVars[envNdx].value;