expand: Fix here-document file descriptor leak

Swap the order of here-document expansion and pipe creation as otherwise the pipe file descriptors will become accessible in the expanded text. Fixes: f4ee8c8 ("[EXPAND] Expand here-documents in the...") Signed-off-by: Herbert Xu <[email protected]> (cherry picked from commit 21847204559bf9a720f3863e19e8f046fdce0bf1)
hvdijk · Apr 25, 2024 · 06fdaa4 · 06fdaa4
1 parent 7af25cd
commit 06fdaa4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/redir.c b/src/redir.c
@@ -247,15 +247,15 @@ openhere(union node *redir)
 	int pip[2];
 	size_t len = 0;
 
-	if (pipe(pip) < 0)
-		sh_error("Pipe call failed");
-
 	p = redir->nhere.doc->narg.text;
 	if (redir->type == NXHERE) {
 		expandarg(redir->nhere.doc, NULL, EXP_QUOTED);
 		p = stackblock();
 	}
 
+	if (pipe(pip) < 0)
+		sh_error("Pipe call failed");
+
 	len = strlen(p);
 	if (len <= PIPESIZE) {
 		xwrite(pip[1], p, len);