about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Src/module.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c3957f049..32bd15928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-06  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 34122: Src/module.c: allow NULL third argument as intended
+
 2015-01-06  Mikael Magnusson  <mikachu@gmail.com>
 
 	* 34138: Src/utils.c: wcs_nicechar: only deref widthp if it
diff --git a/Src/module.c b/Src/module.c
index 9e8b3cc2a..bcc0ba833 100644
--- a/Src/module.c
+++ b/Src/module.c
@@ -3367,7 +3367,7 @@ mod_export int
 handlefeatures(Module m, Features f, int **enables)
 {
     if (!enables || *enables)
-	return setfeatureenables(m, f, *enables);
+	return setfeatureenables(m, f, enables ? *enables : NULL);
     *enables = getfeatureenables(m, f);
     return 0;
 }