traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-37798: Prevent undefined behavior in direct calls to the C helper function. (#16149)

This commit is contained in:
Raymond Hettinger 2019-09-15 09:36:38 -07:00 committed by GitHub
parent 09dc2c672f
commit 6e27a0d775
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/_statisticsmodule.c
View File

@ -32,8 +32,11 @@ _statistics__normal_dist_inv_cdf_impl(PyObject *module, double p, double mu,
/*[clinic end generated code: output=02fd19ddaab36602 input=24715a74be15296a]*/ /*[clinic end generated code: output=02fd19ddaab36602 input=24715a74be15296a]*/
{ {
double q, num, den, r, x; double q, num, den, r, x;
if (p <= 0.0 || p >= 1.0 || sigma <= 0.0) {
goto error;
}
q = p - 0.5; q = p - 0.5;
// Algorithm AS 241: The Percentage Points of the Normal Distribution
if(fabs(q) <= 0.425) { if(fabs(q) <= 0.425) {
r = 0.180625 - q * q; r = 0.180625 - q * q;
// Hash sum-55.8831928806149014439 // Hash sum-55.8831928806149014439
@ -53,10 +56,16 @@ _statistics__normal_dist_inv_cdf_impl(PyObject *module, double p, double mu,
6.8718700749205790830e+2) * r + 6.8718700749205790830e+2) * r +
4.2313330701600911252e+1) * r + 4.2313330701600911252e+1) * r +
1.0); 1.0);
if (den == 0.0) {
goto error;
}
x = num / den; x = num / den;
return mu + (x * sigma); return mu + (x * sigma);
} }
r = (q <= 0.0) ? p : (1.0 - p); r = (q <= 0.0) ? p : (1.0 - p);
if (r <= 0.0 || r >= 1.0) {
goto error;
}
r = sqrt(-log(r)); r = sqrt(-log(r));
if (r <= 5.0) { if (r <= 5.0) {
r = r - 1.6; r = r - 1.6;
@ -97,11 +106,18 @@ _statistics__normal_dist_inv_cdf_impl(PyObject *module, double p, double mu,
5.99832206555887937690e-1) * r + 5.99832206555887937690e-1) * r +
1.0); 1.0);
} }
if (den == 0.0) {
goto error;
}
x = num / den; x = num / den;
if (q < 0.0) { if (q < 0.0) {
x = -x; x = -x;
} }
return mu + (x * sigma); return mu + (x * sigma);
error:
PyErr_SetString(PyExc_ValueError, "inv_cdf undefined for these parameters");
return -1.0;
} }