Skip to content

fix: properly terminate after FindLoop/ReplaceLoop syntax errors #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jodavies merged 1 commit into from
Jun 18, 2025
Merged

fix: properly terminate after FindLoop/ReplaceLoop syntax errors #660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions sources/compcomm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4447,7 +4447,7 @@ NoGood: MesPrint("&Unrecognized word: %s",inp);
inp = p;
SKIPBRA4(p);
c = *++p; *p = 0; *inp = ',';
if ( CoFindLoop(inp) ) goto endofif;
if ( CoFindLoop(inp) ) { error = 1; goto endofif; }
s = u = C->lhs[C->numlhs];
while ( u < C->Pointer ) *w++ = *u++;
C->numlhs--; C->Pointer = s;
Expand Down Expand Up @@ -4996,7 +4996,8 @@ int DoFindLoop(UBYTE *inp, int mode)
int type, aflag, lflag, indflag, outflag, error = 0, sym;
while ( *inp == ',' ) inp++;
if ( ( s = SkipAName(inp) ) == 0 ) {
syntax: MesPrint("&Proper syntax is:");
syntax:
MesPrint("&Proper syntax is:");
MesPrint("%s",messfind[mode]);
return(1);
}
Expand All @@ -5005,6 +5006,7 @@ syntax: MesPrint("&Proper syntax is:");
|| type != CFUNCTION || ( ( sym = (functions[funnum].symmetric) & ~REVERSEORDER )
!= SYMMETRIC && sym != ANTISYMMETRIC ) ) {
MesPrint("&%s should be a (anti)symmetric function or tensor",inp);
error = 1;
}
funnum += FUNCTION;
*s = c; inp = s;
Expand Down Expand Up @@ -5073,6 +5075,7 @@ syntax: MesPrint("&Proper syntax is:");
}
else {
MesPrint("&Unrecognized option in FindLoop or ReplaceLoop: %s",inp);
error = 1;
*s = c; inp = s;
while ( *inp && *inp != ',' ) inp++;
}
Expand Down Expand Up @@ -5112,7 +5115,13 @@ int CoFindLoop(UBYTE *inp)
*/

int CoReplaceLoop(UBYTE *inp)
{ return(DoFindLoop(inp,REPLACELOOP)); }
{
int error = DoFindLoop(inp,REPLACELOOP);
if ( error ) {
Terminate(-1);
}
return(error);
}

/*
#] CoReplaceLoop :
Expand Down
Loading