JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Alias expansion has a recursion check which tries to break the cycle if

Browse Source 
encountered. However, when reading end of input, the source type is set
to SEOF while popping, whereas the recursion check code only checks for
an SALIAS type.

Fix: add a new SF_HASALIAS flag; change u.tblp from being valid if type
is SALIAS to being valid if SF_HASALIAS is set; set SF_HASALIAS for the
created SALIAS sources; set SF_HASALIAS and u.tblp when creating SALIAS
whose next is SEOF on the SEOF source as well.

Reported by Michael Hlavinka as Redhat Bug #474115
This commit is contained in:
tg
2008-12-02 12:39:38 +00:00
parent 177f707a9f
commit 4897682502
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lex.c
View File

@@ -2,7 +2,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.76 2008/11/12 00:54:49 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.77 2008/12/02 12:39:37 tg Exp $");
/*
* states while lexing word
@@ -903,16 +903,24 @@ yylex(int cf)
/* prefer functions over aliases */
ktdelete(p);
else {
Source *s;
Source *s = source;
for (s = source; s->type == SALIAS; s = s->next)
while (s->flags & SF_HASALIAS)
if (s->u.tblp == p)
return LWORD;
else
s = s->next;
/* push alias expansion */
s = pushs(SALIAS, source->areap);
s->start = s->str = p->val.s;
s->u.tblp = p;
s->flags |= SF_HASALIAS;
s->next = source;
if (source->type == SEOF) {
/* prevent infinite recursion at EOS */
source->u.tblp = p;
source->flags |= SF_HASALIAS;
}
source = s;
afree(yylval.cp, ATEMP);
goto Again;