From 2ecccaede9097f867284d352a881d8f226ba4fb7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 12 Mar 2015 15:57:07 -0700 Subject: * stdlib/setenv.c (__add_to_environ): Dump core quickly if setenv (..., NULL, ...) is called. --- stdlib/setenv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'stdlib/setenv.c') diff --git a/stdlib/setenv.c b/stdlib/setenv.c index b60c4f0151..05342367b1 100644 --- a/stdlib/setenv.c +++ b/stdlib/setenv.c @@ -114,8 +114,16 @@ __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); - const size_t vallen = value != NULL ? strlen (value) + 1 : 0; + size_t vallen; + if (combined != NULL) + vallen = strlen (value) + 1; LOCK; -- cgit v1.2.3