summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2015-06-29 21:16:24 +0200
committerAxel Beckert <abe@deuxchevaux.org>2015-06-29 21:16:47 +0200
commit143736dad5e7093a27885fe75a496a797337ff73 (patch)
treef9424959172c6062638ea541cc2e9b5b8864582d
parente79f2175715937a6418d89f6627b640674ca54a4 (diff)
downloadzsh-143736dad5e7093a27885fe75a496a797337ff73.tar.gz
zsh-143736dad5e7093a27885fe75a496a797337ff73.zip
Cherry-pick upstream crash fix to handle failure of gettempname() in namedpipe()
-rw-r--r--debian/patches/cherry-pick-ef080283-handle-failure-of-gettempname-in-namedpipe.patch21
-rw-r--r--debian/patches/series1
2 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/cherry-pick-ef080283-handle-failure-of-gettempname-in-namedpipe.patch b/debian/patches/cherry-pick-ef080283-handle-failure-of-gettempname-in-namedpipe.patch
new file mode 100644
index 000000000..37bc9cd6c
--- /dev/null
+++ b/debian/patches/cherry-pick-ef080283-handle-failure-of-gettempname-in-namedpipe.patch
@@ -0,0 +1,21 @@
+commit ef080283468cbd7b46ceb19c148cd0b9c4d52356
+Author: Barton E. Schaefer <schaefer@zsh.org>
+Date: Sat Jun 27 12:50:40 2015 -0700
+
+ 35634: handle failure of gettempname() in namedpipe()
+
+diff --git a/Src/exec.c b/Src/exec.c
+index 50a11eb..39d1326 100644
+--- a/Src/exec.c
++++ b/Src/exec.c
+@@ -4133,6 +4133,10 @@ namedpipe(void)
+ {
+ char *tnam = gettempname(NULL, 1);
+
++ if (!tnam) {
++ zerr("failed to create named pipe: %e", errno);
++ return NULL;
++ }
+ # ifdef HAVE_MKFIFO
+ if (mkfifo(tnam, 0600) < 0){
+ # else
diff --git a/debian/patches/series b/debian/patches/series
index 115816579..6d0d85293 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
further-mitigate-test-suite-hangs.patch
+cherry-pick-ef080283-handle-failure-of-gettempname-in-namedpipe.patch
cherry-pick-811027a2-fix-signal-queueing-in-zcontext_save_partial-790282.patch