summary refs log tree commit diff
path: root/stdlib/Makefile
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@sourceware.org>2017-01-20 00:45:09 +0530
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2017-01-20 00:45:09 +0530
commit41389c40499a083c59e68ba281ec87be567f2871 (patch)
tree4d5ff86fc8a5216850383149fbe35944c32adb69 /stdlib/Makefile
parent3a66b2b0637e439fb0e7a14c6c3d4c58190eec61 (diff)
downloadglibc-41389c40499a083c59e68ba281ec87be567f2871.tar.gz
glibc-41389c40499a083c59e68ba281ec87be567f2871.tar.xz
glibc-41389c40499a083c59e68ba281ec87be567f2871.zip
Fix environment traversal when an envvar value is empty
The condition when the value of an envvar is empty (not just '\0'),
the loop in tunables_init gets stuck infinitely because envp is not
incremented.  Fix that by always incrementing envp in the loop.

Added test case (tst-empty-env.c) verifies the fix when the source is
configured with --enable-hardcoded-path-in-tests, thanks Josh Stone for
providing the test case.  Verified on x86_64.

	* elf/dl-tunables (get_next_env): Always advance envp.
	* stdlib/tst-empty-env.c: New test case.
	* stdlib/Makefile (tests): Use it.
Diffstat (limited to 'stdlib/Makefile')
-rw-r--r--stdlib/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 0c099733fe..5751b5d600 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -81,6 +81,9 @@ tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
 		   tst-quick_exit tst-thread-quick_exit tst-width	    \
 		   tst-width-stdint tst-strfrom tst-strfrom-locale \
 		   tst-getrandom
+ifeq ($(build-hardcoded-path-in-tests),yes)
+tests += tst-empty-env
+endif
 tests-static	:= tst-secure-getenv
 ifeq ($(have-cxx-thread_local),yes)
 CFLAGS-tst-quick_exit.o = -std=c++11