From cb219290492995bb52fba8c21f9f20afe5604721 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 15 Mar 2015 17:06:21 -0700 Subject: [PATCH] * stdlib/setenv.c (__add_to_environ): Revert previous change. --- ChangeLog | 4 ++++ stdlib/setenv.c | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b3426b220..c856f796e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-03-15 Paul Eggert + + * stdlib/setenv.c (__add_to_environ): Revert previous change. + 2015-03-14 Andreas Schwab [BZ #18128] diff --git a/stdlib/setenv.c b/stdlib/setenv.c index 05342367b1..b60c4f0151 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; -- 2.11.4.GIT