From 2028539cb168d652dfa77e5b85b382c319b3a99a Mon Sep 17 00:00:00 2001
From: Bart Schaefer <schaefer@zsh.org>
Date: Fri, 9 Dec 2022 19:30:35 -0800
Subject: [PATCH] 51161: correct errno after closing xtrace FD
---
ChangeLog | 2 ++
Src/exec.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 7472f056c..0a2a880f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2022-12-09 Bart Schaefer <schaefer@zsh.org>
+ * 51161: Src/exec.c: correct errno after closing xtrace FD
+
* Shohei YOSHIDA: 51111: Completion/Unix/Command/_global:
update completion for global to version 6.6.8
diff --git a/Src/exec.c b/Src/exec.c
index 1810fca5e..a1059af5e 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -4336,10 +4336,13 @@ execcmd_exec(Estate state, Execcmd_params eparams,
}
}
if (newxtrerr) {
+ int eno = errno;
fil = fileno(newxtrerr);
fclose(newxtrerr);
xtrerr = oxtrerr;
+ /* Call zclose() to clean up internal tables, ignore EBADF */
zclose(fil);
+ errno = eno;
}
zsfree(STTYval);