mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-23 17:01:05 +02:00
Code Releases Activity

34590: queue_signals() around more scopes that manipulate global state

Browse source
This commit is contained in:
Barton E. Schaefer 2015-02-20 18:45:36 -08:00
parent b237ba0a8e
commit a4ff8e6957
3 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-02-20 Barton E. Schaefer <schaefer@zsh.org>
* 34590: Src/exec.c, Src/text.c: queue_signals() around more
scopes that manipulate global state
2015-02-20 Peter Stephenson <p.stephenson@samsung.com>
* 34587: Src/utils.c, Test/D07multibyte.ztst: ensure multibyte

4
Src/exec.c
View file

@ -2337,6 +2337,7 @@ addvars(Estate state, Wordcode pc, int addflags)
void
setunderscore(char *str)
{
queue_signals();
if (str && *str) {
int l = strlen(str) + 1, nl = (l + 31) & ~31;
@ -2354,6 +2355,7 @@ setunderscore(char *str)
*zunderscore = '\0';
underscoreused = 1;
}
unqueue_signals();
}
/* These describe the type of expansions that need to be done on the words
@ -5319,7 +5321,7 @@ execsave(void)
{
struct execstack *es;
es = (struct execstack *) malloc(sizeof(struct execstack));
es = (struct execstack *) zalloc(sizeof(struct execstack));
es->list_pipe_pid = list_pipe_pid;
es->nowait = nowait;
es->pline_level = pline_level;

15
Src/text.c
View file

@ -173,6 +173,8 @@ getpermtext(Eprog prog, Wordcode c, int start_indent)
{
struct estate s;
queue_signals();
if (!c)
c = prog->prog;
@ -193,6 +195,9 @@ getpermtext(Eprog prog, Wordcode c, int start_indent)
*tptr = '\0';
freeeprog(prog); /* mark as unused */
untokenize(tbuf);
unqueue_signals();
return tbuf;
}
@ -206,6 +211,8 @@ getjobtext(Eprog prog, Wordcode c)
struct estate s;
queue_signals();
if (!c)
c = prog->prog;
@ -224,6 +231,9 @@ getjobtext(Eprog prog, Wordcode c)
*tptr = '\0';
freeeprog(prog); /* mark as unused */
untokenize(jbuf);
unqueue_signals();
return jbuf;
}
@ -883,6 +893,9 @@ getredirs(LinkList redirs)
">", ">|", ">>", ">>|", "&>", "&>|", "&>>", "&>>|", "<>", "<",
"<<", "<<-", "<<<", "<&", ">&", NULL /* >&- */, "<", ">"
};
queue_signals();
taddchr(' ');
for (n = firstnode(redirs); n; incnode(n)) {
Redir f = (Redir) getdata(n);
@ -970,4 +983,6 @@ getredirs(LinkList redirs)
}
}
tptr--;
unqueue_signals();
}