summary refs log tree commit diff
diff options
context:
space:
mode:
authorTaylor West <KrokodileGlue@outlook.com>2018-03-01 01:15:37 +0000
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2018-03-04 20:57:58 +0000
commit14c17aa17870e83736fa479f49b338ba8dc69f6c (patch)
tree24fd7f3f6129b77638f1dad49917386705f3ed38
parent1d6954bd2f047ed7e6b608eaf40bf0e1c5429b67 (diff)
downloadzsh-14c17aa17870e83736fa479f49b338ba8dc69f6c.tar.gz
zsh-14c17aa17870e83736fa479f49b338ba8dc69f6c.tar.xz
zsh-14c17aa17870e83736fa479f49b338ba8dc69f6c.zip
42411: Assume current C librarires handle free(NULL)
-rw-r--r--ChangeLog5
-rw-r--r--Src/mem.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c6b48d14a..463510d08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-04  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* Taylor West: 42411: Src/mem.c: assume any current C compiler
+	will handle NULL argument to free.
+
 2018-02-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 23180: Src/Zle/zle_tricky.c: Square brackets in dynamic
diff --git a/Src/mem.c b/Src/mem.c
index f1208197b..77e4375f0 100644
--- a/Src/mem.c
+++ b/Src/mem.c
@@ -1885,16 +1885,14 @@ bin_mem(char *name, char **argv, Options ops, int func)
 mod_export void
 zfree(void *p, UNUSED(int sz))
 {
-    if (p)
-	free(p);
+    free(p);
 }
 
 /**/
 mod_export void
 zsfree(char *p)
 {
-    if (p)
-	free(p);
+    free(p);
 }
 
 /**/