Re: [bug] {fd}<<EOF

[Peter Stephenson <p.w.stephenson@xxxxxxxxxxxx>]

On Thu, 2019-06-20 at 06:02 +0100, Stephane Chazelas wrote:
> $ zsh -xc $': {fd}<< EOF\nEOF'
> +zsh:1> [[ - $'\C-D'zsh:1: bad cond code
>  ]]
> 
> On the more complicated code I first ran into the problem, it
> was crashing with "out of memory".
> 
> exec {fd}<<EOF
> EOF
> 
> is a bash-compatible way to get a temp file that automatically
> cleans up on exit. Needs Linux or Cygwin to manipulate it with
> /dev/fd/$fd

diff --git a/Src/parse.c b/Src/parse.c
index 27234497b..53709ac00 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -2279,7 +2279,8 @@ par_redir(int *rp, char *idstring)
 void
 setheredoc(int pc, int type, char *str, char *termstr, char *munged_termstr)
 {
-    ecbuf[pc] = WCB_REDIR(type | REDIR_FROM_HEREDOC_MASK);
+    int varid = WC_REDIR_VARID(ecbuf[pc]) ? REDIR_VARID_MASK : 0;
+    ecbuf[pc] = WCB_REDIR(type | REDIR_FROM_HEREDOC_MASK | varid);
     ecbuf[pc + 2] = ecstrcode(str);
     ecbuf[pc + 3] = ecstrcode(termstr);
     ecbuf[pc + 4] = ecstrcode(munged_termstr);
diff --git a/Test/A04redirect.ztst b/Test/A04redirect.ztst
index 1e17dddd4..d60519064 100644
--- a/Test/A04redirect.ztst
+++ b/Test/A04redirect.ztst
@@ -692,11 +692,19 @@
 >b
 >d
 
-  umask 0777
+  (umask 0777
   cat <<'  HERE'
   look ma, no permissions
   HERE
   cat <<<"it's a miracle"
+  )
 0:Here-{string,document}s succeed with restrictive umask
 >  look ma, no permissions
 >it's a miracle
+
+  exec {testfd}<<'  HERE'
+  This is, in some sense, a here document.
+  HERE
+  cat <&$testfd
+0:Regression test for here document with fd declarator
+>  This is, in some sense, a here document.