From: Rich Felker Date: Tue, 1 May 2018 18:46:59 +0000 (-0400) Subject: avoid excessive stack usage in getcwd X-Git-Tag: v1.1.20~97 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=375840c7d8e1f58a9bf40ced72fbe82635f49489;p=oweals%2Fmusl.git avoid excessive stack usage in getcwd to support the GNU extension of allocating a buffer for getcwd's result when a null pointer is passed without incurring a link dependency on free, we use a PATH_MAX-sized buffer on the stack and only duplicate it to allocated storage after the operation succeeds. unfortunately this imposed excessive stack usage on all callers, including those not making use of the GNU extension. instead, use a VLA to make stack allocation conditional. --- diff --git a/src/unistd/getcwd.c b/src/unistd/getcwd.c index 103fbbb5..f407ffe0 100644 --- a/src/unistd/getcwd.c +++ b/src/unistd/getcwd.c @@ -6,10 +6,10 @@ char *getcwd(char *buf, size_t size) { - char tmp[PATH_MAX]; + char tmp[buf ? 1 : PATH_MAX]; if (!buf) { buf = tmp; - size = PATH_MAX; + size = sizeof tmp; } else if (!size) { errno = EINVAL; return 0;