stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 04:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a.

Browse source 
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)

(cherry picked from commit 797ca99f42)
This commit is contained in:
Monster Iestyn 2019-04-14 16:39:14 +01:00 committed by James R
parent f856f18233
commit db5cb986ee
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/command.c
View file

@ -543,10 +543,7 @@ static void COM_ExecuteString(char *ptext)
if (!stricmp(com_argv[0], a->name)) if (!stricmp(com_argv[0], a->name))
{ {
if (recursion > MAX_ALIAS_RECURSION) if (recursion > MAX_ALIAS_RECURSION)
{
CONS_Alert(CONS_WARNING, M_GetText("Alias recursion cycle detected!\n")); CONS_Alert(CONS_WARNING, M_GetText("Alias recursion cycle detected!\n"));
recursion = 0;
}
else else
{ {
char buf[1024]; char buf[1024];
@ -578,8 +575,10 @@ static void COM_ExecuteString(char *ptext)
} }
WRITESTRING(write, read); WRITESTRING(write, read);
// Monster Iestyn: keep track of how many levels of recursion we're in
recursion++; recursion++;
COM_BufInsertText(buf); COM_BufInsertText(buf);
recursion--;
} }
return; return;
} }