This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.21-201-gcb21929
- From: eggert at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Mar 2015 00:06:45 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-201-gcb21929
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via cb219290492995bb52fba8c21f9f20afe5604721 (commit)
from a3905fd9de77ffce9d2b6042b512b1816d90a3d2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cb219290492995bb52fba8c21f9f20afe5604721
commit cb219290492995bb52fba8c21f9f20afe5604721
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun Mar 15 17:06:21 2015 -0700
* stdlib/setenv.c (__add_to_environ): Revert previous change.
diff --git a/ChangeLog b/ChangeLog
index 9b3426b..c856f79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-15 Paul Eggert <eggert@cs.ucla.edu>
+
+ * stdlib/setenv.c (__add_to_environ): Revert previous change.
+
2015-03-14 Andreas Schwab <schwab@linux-m68k.org>
[BZ #18128]
diff --git a/stdlib/setenv.c b/stdlib/setenv.c
index 0534236..b60c4f0 100644
--- a/stdlib/setenv.c
+++ b/stdlib/setenv.c
@@ -114,16 +114,8 @@ __add_to_environ (name, value, combined, replace)
{
char **ep;
size_t size;
-
- /* Compute lengths before locking, so that the critical section is
- less of a performance bottleneck. VALLEN is needed only if
- COMBINED is non-null. Also, testing COMBINED instead of VALUE
- causes setenv (..., NULL, ...) to dump core now instead of
- corrupting memory later. */
const size_t namelen = strlen (name);
- size_t vallen;
- if (combined != NULL)
- vallen = strlen (value) + 1;
+ const size_t vallen = value != NULL ? strlen (value) + 1 : 0;
LOCK;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
stdlib/setenv.c | 10 +---------
2 files changed, 5 insertions(+), 9 deletions(-)
hooks/post-receive
--
GNU C Library master sources