Skip to content

Fix crash in transform addargs/mulargs if function has no args #688

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
merged 2 commits into from
Jul 9, 2025
Merged

Fix crash in transform addargs/mulargs if function has no args #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c888ac
fix: ignore empty functions in transform addargs/mulargs
jodavies Jun 16, 2025
1586eb4
fix: correct error message for 0 range specifier in transform
jodavies Jun 16, 2025
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
13 changes: 13 additions & 0 deletions check/fixes.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2331,6 +2331,19 @@ P;
#pend_if mpi?
assert runtime_error?
*--#] Issue261_7 :
*--#[ Issue267 :
#-
CFunction f,g,h,i;
Local test = f + g + h(1,2) + i(1,2) + h(1,2,3) + i(1,2,3);
Transform f addargs(1,last);
Transform g mulargs(1,last);
Transform h addargs(1,3);
Transform i mulargs(1,3);
Print;
.end
assert succeeded?
assert result("test") =~ expr("f + g + h(1,2) + h(6) + i(2) + i(6)");
*--#] Issue267 :
*--#[ Issue268_1 :
* Invalid read in Normalize
#define N "9999"
Expand Down
23 changes: 16 additions & 7 deletions sources/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2703,6 +2703,8 @@ WORD RunAddArg(PHEAD WORD *fun, WORD *args)
}
tt = fun+FUNHEAD; tstop = fun+fun[1]; totarg = 0;
while ( tt < tstop ) { totarg++; NEXTARG(tt); }
/* ignore functions with no arguments */
if ( totarg == 0 ) return(0);
if ( FindRange(BHEAD args,&arg1,&arg2,totarg) ) return(-1);
/*
We need to:
Expand Down Expand Up @@ -2791,6 +2793,8 @@ WORD RunMulArg(PHEAD WORD *fun, WORD *args)
}
t = fun+FUNHEAD; tstop = fun+fun[1]; totarg = 0;
while ( t < tstop ) { totarg++; NEXTARG(t); }
/* ignore functions with no arguments */
if ( totarg == 0 ) return(0);
if ( FindRange(BHEAD args,&arg1,&arg2,totarg) ) return(-1);
if ( arg2 < arg1 ) { n = arg1; arg1 = arg2; arg2 = n; }
if ( arg1 > totarg ) return(0);
Expand Down Expand Up @@ -3552,20 +3556,25 @@ int FindRange(PHEAD WORD *args, WORD *arg1, WORD *arg2, WORD totarg)
n[i] -= MAXPOSITIVE4; /* Now we have the number of the dollar variable */
}
n[i] = DolToNumber(BHEAD n[i]);
if ( AN.ErrorInDollar ) goto Error;
if ( AN.ErrorInDollar ) {
MLOCK(ErrorMessageLock);
MesPrint("Illegal $ value in range while executing transform statement.");
MUNLOCK(ErrorMessageLock);
return(-1);
}
if ( fromlast ) n[i] = totarg-n[i];
}
else if ( n[i] >= MAXPOSITIVE4 ) { n[i] = totarg-(n[i]-MAXPOSITIVE4); }
if ( n[i] <= 0 ) goto Error;
if ( n[i] <= 0 ) {
MLOCK(ErrorMessageLock);
MesPrint("Illegal non-positive value in range (%d) while executing transform statement.", i+1);
MUNLOCK(ErrorMessageLock);
return(-1);
}
}
*arg1 = n[0];
*arg2 = n[1];
return(0);
Error:
MLOCK(ErrorMessageLock);
MesPrint("Illegal $ value in range while executing transform statement.");
MUNLOCK(ErrorMessageLock);
return(-1);
}

/*
Expand Down
Loading