OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* stdlib/setenv.c (__add_to_environ): Revert previous change.

This commit is contained in:
Paul Eggert 2015-03-15 17:06:21 -07:00
parent a3905fd9de
commit cb21929049
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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]

10
stdlib/setenv.c
View File

@ -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;