Skip to content

fix: protect error messages in float.c with locks. #772

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
cbmarini merged 1 commit into from
Jan 21, 2026
Merged

fix: protect error messages in float.c with locks. #772

Show file tree
Hide file tree
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
76 changes: 76 additions & 0 deletions check/features.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,6 +1554,20 @@ assert result("F3") =~ expr("1/1000000*x^5")
assert result("F4") =~ expr("4.7e+00*x - 5.0e-05*x^4 + 1/1000000*x^5")
assert result("F5") =~ expr("1/1000000*x^5")
*--#] chop :
*--#[ chop_error :
Chop 10;
#StartFloat 10d
Chop;
Chop 1/0;
Chop 1e-10a;
.end
#pend_if wordsize == 2
assert compile_error?("Illegal attempt to chop a float_ without activating floating point numbers.")
assert compile_error?("Forgotten #startfloat instruction?")
assert compile_error?("Chop needs a number (float, rational or power) as an argument.")
assert compile_error?("Division by zero in chop statement.")
assert compile_error?("Illegal argument(s) in Chop statement: 'a'.")
*--#] chop_error :
*--#[ pattern_float :
#-
Off Statistics;
Expand Down Expand Up @@ -1875,17 +1889,33 @@ assert result("FloatZero") =~ expr("f(0.0e+00, - 1.23e+02,0.0e+00,0.0e+00,0.0e+0
0.0e+00)")
*--#] float_zero :
*--#[ float_error :
Local F = 1.0;
Evaluate;
ToFloat;
ToRat;
.sort
#StartFloat 10d
Evaluate x;
.sort
CFunction x;
Evaluate x;
ToFloat y;
ToRat z;
.end
#pend_if wordsize == 2
assert compile_error?("The floating point system has not been started: .0")
assert compile_error?("Illegal character at this position: .0")
assert compile_error?("Illegal position for 0")
assert compile_error?("Illegal attempt to evaluate a function without activating floating point numbers.")
assert compile_error?("Forgotten #startfloat instruction?")
assert compile_error?("Illegal attempt to convert to float_ without activating floating point numbers.")
assert compile_error?("Forgotten #startfloat instruction?")
assert compile_error?("Illegal attempt to convert from float_ without activating floating point numbers.")
assert compile_error?("Forgotten #startfloat instruction?")
assert compile_error?("should be a built in function that can be evaluated numerically.")
assert compile_error?("should be a built in function that can be evaluated numerically.")
assert compile_error?("Illegal argument(s) in ToFloat statement: 'y'")
assert compile_error?("Illegal argument(s) in ToRat statement: 'z'")
*--#] float_error :
*--#[ format_and_floats :
#-
Expand Down Expand Up @@ -2247,6 +2277,52 @@ EOF
#pend_if wordsize == 2
runtime_error?("Illegal parameter in #StartFloat: 100bd,MZV = 10")
*--#] startfloat_error :
*--#[ mzv_error_1:
#StartFloat 10d, MZV=2
Local F = mzv_(2,1);
Evaluate mzv_;
.end
#pend_if wordsize == 2
#pend_if mpi?
runtime_error?("Error: Weight of Euler/MZV sum greater than 2.")
runtime_error?("Please increase the maximum weight in #startfloat.")
*--#] mzv_error_1 :
*--#[ mzv_error_2:
#StartFloat 10d, MZV=3
Local F = mzv_(1,2);
Evaluate mzv_;
.end
#pend_if wordsize == 2
#pend_if mpi?
runtime_error?("Divergent MZV in CalculateMZV")
*--#] mzv_error_2 :
*--#[ mzv_error_3:
#StartFloat 10d, MZV=3
Local F = mzv_(-2,1);
Evaluate mzv_;
.end
#pend_if wordsize == 2
#pend_if mpi?
runtime_error?("Illegal index[0] in CalculateMZV: -2")
*--#] mzv_error_3 :
*--#[ mzv_error_4:
#StartFloat 10d, MZV=3
Local F = mzvhalf_(2,-1);
Evaluate mzvhalf_;
.end
#pend_if wordsize == 2
#pend_if mpi?
runtime_error?("Illegal index[1] in CalculateMZVhalf: -1")
*--#] mzv_error_4 :
*--#[ mzv_error_5:
#StartFloat 10d, MZV=3
Local F = euler_(1,-2);
Evaluate euler_;
.end
#pend_if wordsize == 2
#pend_if mpi?
runtime_error?("Divergent Euler sum in CalculateEuler")
*--#] mzv_error_5 :
*--#[ humanstats :
#-
On humanstats;
Expand Down
83 changes: 56 additions & 27 deletions sources/float.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,10 @@ int UnpackFloat(mpf_t outfloat,WORD *fun)
*/
GETIDENTITY
if ( AT.aux_ == 0 ) {
MLOCK(ErrorMessageLock);
MesPrint("Illegal attempt at using a float_ function without proper startup.");
MesPrint("Please use %#StartFloat <options> first.");
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
/*
Expand Down Expand Up @@ -1355,7 +1357,7 @@ int CoChop(UBYTE *s)
return(1);
}
if ( *s == 0 ) {
MesPrint("&Chop needs a number (float or rational) as an argument.");
MesPrint("&Chop needs a number (float, rational or power) as an argument.");
return(1);
}
/* Create TYPECHOP header */
Expand Down Expand Up @@ -1422,7 +1424,7 @@ int CoChop(UBYTE *s)
}
}
if ( *s ) {
MesPrint("&Illegal argument(s) in Chop statement: '%s'",s);
MesPrint("&Illegal argument(s) in Chop statement: '%s'.",s);
return(1);
}
AT.WorkPointer = OldWork;
Expand Down Expand Up @@ -2006,8 +2008,10 @@ void SingleTable(mpf_t *tabl, int N, int m, int pow)
mpf_t jm,jjm;
mpf_init(jm); mpf_init(jjm);
if ( pow < 1 || pow > 2 ) {
printf("Wrong parameter pow in SingleTable: %d\n",pow);
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Wrong parameter pow in SingleTable: %d\n",pow);
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
if ( m < 0 ) { m = -m; s = -1; }
mpf_set_si(auxsum,0L);
Expand Down Expand Up @@ -2047,8 +2051,10 @@ void DoubleTable(mpf_t *tabout, mpf_t *tabin, int N, int m, int pow)
mpf_t jm,jjm;
mpf_init(jm); mpf_init(jjm);
if ( pow < -1 || pow > 2 ) {
printf("Wrong parameter pow in SingleTable: %d\n",pow);
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Wrong parameter pow in DoubleTable: %d\n",pow);
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
if ( m < 0 ) { m = -m; s = -1; }
mpf_set_ui(auxsum,0L);
Expand Down Expand Up @@ -2097,8 +2103,10 @@ void EndTable(mpf_t sum, mpf_t *tabin, int N, int m, int pow)
mpf_t jm,jjm;
mpf_init(jm); mpf_init(jjm);
if ( pow < -1 || pow > 2 ) {
printf("Wrong parameter pow in SingleTable: %d\n",pow);
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Wrong parameter pow in EndTable: %d\n",pow);
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
if ( m < 0 ) { m = -m; s = -1; }
mpf_set_si(sum,0L);
Expand Down Expand Up @@ -2271,7 +2279,10 @@ void deltaEulerC(mpf_t result, WORD *indexes, int depth)
mpf_set_ui(result,0);
if ( depth == 1 ) {
if ( indexes[0] == 0 ) {
printf("Illegal index in depth=1 deltaEulerC: %d\n",indexes[0]);
MLOCK(ErrorMessageLock);
MesPrint("Illegal index in depth=1 deltaEulerC: %d\n",indexes[0]);
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
if ( indexes[0] < 0 ) SimpleDeltaC(result,indexes[0]);
else SimpleDelta(result,indexes[0]);
Expand Down Expand Up @@ -2332,13 +2343,17 @@ void CalculateMZVhalf(mpf_t result, WORD *indexes, int depth)
{
int i;
if ( depth < 0 ) {
printf("Illegal depth in CalculateMZVhalf: %d\n",depth);
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Illegal depth in CalculateMZVhalf: %d",depth);
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
for ( i = 0; i < depth; i++ ) {
if ( indexes[i] <= 0 ) {
printf("Illegal index[%d] in CalculateMZVhalf: %d\n",i,indexes[i]);
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Illegal index[%d] in CalculateMZVhalf: %d",i,indexes[i]);
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
}
deltaMZV(result,indexes,depth);
Expand All @@ -2354,18 +2369,24 @@ void CalculateMZV(mpf_t result, WORD *indexes, int depth)
GETIDENTITY
int num1, num2 = 0, i, j = 0;
if ( depth < 0 ) {
printf("Illegal depth in CalculateMZV: %d\n",depth);
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Illegal depth in CalculateMZV: %d",depth);
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
if ( indexes[0] == 1 ) {
printf("Divergent MZV in CalculateMZV\n");
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Divergent MZV in CalculateMZV");
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
/* MesPrint("calculateMZV(%a)",depth,indexes); */
for ( i = 0; i < depth; i++ ) {
if ( indexes[i] <= 0 ) {
printf("Illegal index[%d] in CalculateMZV: %d\n",i,indexes[i]);
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Illegal index[%d] in CalculateMZV: %d",i,indexes[i]);
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
AT.indi1[i] = indexes[i];
}
Expand Down Expand Up @@ -2428,17 +2449,23 @@ void CalculateEuler(mpf_t result, WORD *Zindexes, int depth)
}

if ( depth < 0 ) {
printf("Illegal depth in CalculateEuler: %d\n",depth);
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Illegal depth in CalculateEuler: %d\n",depth);
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
if ( indexes[0] == 1 ) {
printf("Divergent Euler sum in CalculateEuler\n");
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Divergent Euler sum in CalculateEuler\n");
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
for ( i = 0, j = 0; i < depth; i++ ) {
if ( indexes[i] == 0 ) {
printf("Illegal index[%d] in CalculateEuler: %d\n",i,indexes[i]);
exit(-1);
MLOCK(ErrorMessageLock);
MesPrint("Illegal index[%d] in CalculateEuler: %d\n",i,indexes[i]);
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
if ( indexes[i] < 0 ) j = 1;
AT.indi1[i] = indexes[i];
Expand Down Expand Up @@ -2558,8 +2585,10 @@ int EvaluateEuler(PHEAD WORD *term, WORD level, WORD par)
/* euler sum without arguments, i.e. mzv_(), euler_() or mzvhalf_() */
if ( depth == 0) goto nextfun;
if ( sumweight > AC.MaxWeight ) {
MesPrint("Error: Weight of Euler/MZV sum greater than %d",sumweight);
MesPrint("Please increase MaxWeight in form.set.");
MLOCK(ErrorMessageLock);
MesPrint("Error: Weight of Euler/MZV sum greater than %d.",AC.MaxWeight);
MesPrint("Please increase the maximum weight in %#startfloat.");
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
/*
Expand Down
Loading