summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Src/subst.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cebb5b09..d277ede21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-21  Bart Schaefer  <schaefer@zsh.org>
+
+	* 43921: ${\var} should be an error
+
 2018-12-19  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted: Config/version.mk, Etc/FAQ.yo, README: update for
diff --git a/Src/subst.c b/Src/subst.c
index ff6750a59..60eb33390 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -2338,7 +2338,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags,
 		zerr("bad substitution");
 		return NULL;
 	    }
-	} else if (inbrace && inull(*s)) {
+	} else if (inbrace && inull(*s) && *s != Bnull) {
 	    /*
 	     * Handles things like ${(f)"$(<file)"} by skipping 
 	     * the double quotes.  We don't need to know what was