faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash and hangs in RGR_FindBestRobustRegression

Browse source
This commit is contained in:
Miroslav Lichvar 2012-11-29 16:23:22 +01:00
parent 1ca844af98
commit b14689d59b
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
regress.c
View file

@ -588,7 +588,7 @@ RGR_FindBestRobustRegression
Estimate standard deviation of b and expand range about b based Estimate standard deviation of b and expand range about b based
on that. */ on that. */
sb = sqrt(s2 * W/V); sb = sqrt(s2 * W/V);
if (sb > 0.0) { if (sb > tol) {
incr = 3.0 * sb; incr = 3.0 * sb;
} else { } else {
incr = 3.0 * tol; incr = 3.0 * tol;
@ -598,6 +598,11 @@ RGR_FindBestRobustRegression
bhi = b; bhi = b;
do { do {
/* Make sure incr is significant to blo and bhi */
while (bhi + incr == bhi || blo - incr == blo) {
incr *= 2;
}
blo -= incr; blo -= incr;
bhi += incr; bhi += incr;
@ -605,8 +610,8 @@ RGR_FindBestRobustRegression
eval_robust_residual(x + start, y + start, n_points, blo, &a, &rlo); eval_robust_residual(x + start, y + start, n_points, blo, &a, &rlo);
eval_robust_residual(x + start, y + start, n_points, bhi, &a, &rhi); eval_robust_residual(x + start, y + start, n_points, bhi, &a, &rhi);
} while (rlo * rhi > 0.0); /* fn vals have same sign, i.e. root not } while (rlo * rhi >= 0.0); /* fn vals have same sign or one is zero,
in interval. */ i.e. root not in interval (rlo, rhi). */
/* OK, so the root for b lies in (blo, bhi). Start bisecting */ /* OK, so the root for b lies in (blo, bhi). Start bisecting */
do { do {
@ -623,7 +628,7 @@ RGR_FindBestRobustRegression
} else { } else {
assert(0); assert(0);
} }
} while ((bhi - blo) > tol); } while ((bhi - blo) > tol && (bmid - blo) * (bhi - bmid) > 0.0);
*b0 = a; *b0 = a;
*b1 = bmid; *b1 = bmid;