mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-19 11:31:26 +01:00
Code Releases Activity

31832: make execrestore() more signal-safe.

Browse source
This commit is contained in:
Bart Schaefer 2013-10-17 07:35:05 -07:00
parent ff520d1b79
commit 978b5bcc8d
2 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -4,6 +4,8 @@
HISTORY_IGNORE pattern to exclude matching lines in the
internal history from the HISTFILE at write time.
* 31832: Src/exec.c: make execrestore() more signal-safe.
2013-10-17 Peter Stephenson <p.stephenson@samsung.com>
* 31830: Doc/Zsh/func.yo, README, Src/hist.c, Src/zsh.h:

50
Src/exec.c
View file

@ -5078,29 +5078,33 @@ execsave(void)
void
execrestore(void)
{
struct execstack *en;
struct execstack *en = exstack;
DPUTS(!exstack, "BUG: execrestore() without execsave()");
list_pipe_pid = exstack->list_pipe_pid;
nowait = exstack->nowait;
pline_level = exstack->pline_level;
list_pipe_child = exstack->list_pipe_child;
list_pipe_job = exstack->list_pipe_job;
strcpy(list_pipe_text, exstack->list_pipe_text);
lastval = exstack->lastval;
noeval = exstack->noeval;
badcshglob = exstack->badcshglob;
cmdoutpid = exstack->cmdoutpid;
cmdoutval = exstack->cmdoutval;
use_cmdoutval = exstack->use_cmdoutval;
trap_return = exstack->trap_return;
trap_state = exstack->trap_state;
trapisfunc = exstack->trapisfunc;
traplocallevel = exstack->traplocallevel;
noerrs = exstack->noerrs;
setunderscore(exstack->underscore);
zsfree(exstack->underscore);
en = exstack->next;
free(exstack);
exstack = en;
queue_signals();
exstack = exstack->next;
list_pipe_pid = en->list_pipe_pid;
nowait = en->nowait;
pline_level = en->pline_level;
list_pipe_child = en->list_pipe_child;
list_pipe_job = en->list_pipe_job;
strcpy(list_pipe_text, en->list_pipe_text);
lastval = en->lastval;
noeval = en->noeval;
badcshglob = en->badcshglob;
cmdoutpid = en->cmdoutpid;
cmdoutval = en->cmdoutval;
use_cmdoutval = en->use_cmdoutval;
trap_return = en->trap_return;
trap_state = en->trap_state;
trapisfunc = en->trapisfunc;
traplocallevel = en->traplocallevel;
noerrs = en->noerrs;
setunderscore(en->underscore);
zsfree(en->underscore);
free(en);
unqueue_signals();
}