summary refs log tree commit diff
path: root/src/mail.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2018-05-19 02:39:48 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2018-05-28 17:12:23 +0800
commit4f7527f8e49276894751a9b100e68bc46568bb85 (patch)
tree8a6ece3bcd6d66225c94f1df33b7fd08163aba42 /src/mail.c
parentmemalloc: Add growstackto helper (diff)
downloaddash-4f7527f8e49276894751a9b100e68bc46568bb85.tar.gz
dash-4f7527f8e49276894751a9b100e68bc46568bb85.zip
exec: Do not allocate stack string in padvance
Many callers of padvance immediately free the allocated string
so this patch moves the stalloc call to the caller.  Instead of
returning the allocated string, padvance now returns the length
to allocate (this may be longer than the actual string length,
even including the NUL).  For the case where we would previously
return NULL, we now return -1.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'src/mail.c')
-rw-r--r--src/mail.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mail.c b/src/mail.c
index 02e07f7..7f9e49d 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -77,9 +77,12 @@ chkmail(void)
 	setstackmark(&smark);
 	mpath = mpathset() ? mpathval() : mailval();
 	for (mtp = mailtime; mtp < mailtime + MAXMBOXES; mtp++) {
-		p = padvance(&mpath, nullstr);
-		if (p == NULL)
+		int len;
+
+		len = padvance(&mpath, nullstr);
+		if (!len)
 			break;
+		p = stackblock();
 		if (*p == '\0')
 			continue;
 		for (q = p ; *q ; q++);