mirrors
/
zsh
mirror of git://git.code.sf.net/p/zsh/code
1
0
Fork 0
Code Releases Activity

obscure crash with hasbrpsfx()

This commit is contained in:
Peter Stephenson 2006-10-30 12:57:52 +00:00
parent ff9f2bb88e
commit 9986ebfd33
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-10-27 Peter Stephenson <pws@csr.com>
* 22921: Src/compresult.c: obscure crash reveals
hasbrpsfx() can be called with line unmetafied.
2006-10-30 Peter Stephenson <pws@csr.com>
* 22913: Doc/Zsh/params.yo, Src/jobs.c: set $! after a "bg", too.

14
Src/Zle/compresult.c
View File

@ -683,11 +683,19 @@ instmatch(Cmatch m, int *scs)
mod_export int
hasbrpsfx(Cmatch m, char *pre, char *suf)
{
METACHECK();
int was_meta;
if (m->flags & CMF_ALL)
return 1;
else {
/* May not be metafied if calculating whether to show a list. */
if (zlemetaline == NULL) {
was_meta = 0;
metafy_line();
} else
was_meta = 1;
{
char *op = lastprebr, *os = lastpostbr;
VARARR(char, oline, zlemetall);
int oll = zlemetall, ocs = zlemetacs, ole = lastend, opcs = brpcs, oscs = brscs, ret;
@ -717,6 +725,8 @@ hasbrpsfx(Cmatch m, char *pre, char *suf)
lastprebr = op;
lastpostbr = os;
if (!was_meta)
unmetafy_line();
return ret;
}
}