diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2015-06-28 18:16:59 +0200 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2015-06-28 18:34:02 +0200 |
commit | e79f2175715937a6418d89f6627b640674ca54a4 (patch) | |
tree | cb94127caa3df2be25a9fe07038fa71e870e2369 | |
parent | 5808540c28cb9da6fc30a739b432350f45c02aa7 (diff) | |
download | zsh-e79f2175715937a6418d89f6627b640674ca54a4.tar.gz zsh-e79f2175715937a6418d89f6627b640674ca54a4.zip |
Cherry-pick upstream patch to fix signal queueing in zcontext_save_partial()
Closes: #790282
-rw-r--r-- | debian/patches/cherry-pick-811027a2-fix-signal-queueing-in-zcontext_save_partial-790282.patch | 29 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/cherry-pick-811027a2-fix-signal-queueing-in-zcontext_save_partial-790282.patch b/debian/patches/cherry-pick-811027a2-fix-signal-queueing-in-zcontext_save_partial-790282.patch new file mode 100644 index 000000000..3d61927cb --- /dev/null +++ b/debian/patches/cherry-pick-811027a2-fix-signal-queueing-in-zcontext_save_partial-790282.patch @@ -0,0 +1,29 @@ +commit 811027a22a806f753537abee1575da8714d3fa0a +Author: Barton E. Schaefer <schaefer@zsh.org> +Date: Sat Jun 27 15:53:21 2015 -0700 +Bug-Debian: https://bugs.debian.org/790282 + + 35642: signal queueing in zcontext_save_partial() + +diff --git a/Src/context.c b/Src/context.c +index 1b8741f..2dc8d3b 100644 +--- a/Src/context.c ++++ b/Src/context.c +@@ -53,6 +53,8 @@ zcontext_save_partial(int parts) + { + struct context_stack *cs; + ++ queue_signals(); ++ + cs = (struct context_stack *)malloc(sizeof(struct context_stack)); + + if (parts & ZCONTEXT_HIST) { +@@ -67,6 +69,8 @@ zcontext_save_partial(int parts) + + cs->next = cstack; + cstack = cs; ++ ++ unqueue_signals(); + } + + /* save context in full */ diff --git a/debian/patches/series b/debian/patches/series index 857f0f26d..115816579 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ further-mitigate-test-suite-hangs.patch +cherry-pick-811027a2-fix-signal-queueing-in-zcontext_save_partial-790282.patch |