summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2018-02-26 20:21:56 +0000
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2018-02-26 20:21:56 +0000
commit14743c0dfdb81a6a4a051921e56a61c3b1e0e664 (patch)
treedf81d66347a3ec4b3758afc3e35528e2eb47b893 /Src
parentba7de6d0d52578d343a56b49083456ebf00dfb26 (diff)
downloadzsh-14743c0dfdb81a6a4a051921e56a61c3b1e0e664.tar.gz
zsh-14743c0dfdb81a6a4a051921e56a61c3b1e0e664.tar.xz
zsh-14743c0dfdb81a6a4a051921e56a61c3b1e0e664.zip
42401: workaround for gcc -foptimize-strlen oddit.
Use realloc(NULL, ...) instead of malloc in zsh-mem calloc().
Diffstat (limited to 'Src')
-rw-r--r--Src/mem.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/Src/mem.c b/Src/mem.c
index 840bbb6e4..f1208197b 100644
--- a/Src/mem.c
+++ b/Src/mem.c
@@ -1719,7 +1719,13 @@ calloc(MALLOC_ARG_T n, MALLOC_ARG_T size)
     if (!(l = n * size))
 	return (MALLOC_RET_T) m_high;
 
-    r = malloc(l);
+    /*
+     * use realloc() (with a NULL `p` argument it behaves exactly the same
+     * as malloc() does) to prevent an infinite loop caused by sibling-call
+     * optimizations (the malloc() call would otherwise be replaced by an
+     * unconditional branch back to line 1719 ad infinitum).
+     */
+    r = realloc(NULL, l);
 
     memset(r, 0, l);