diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2019-04-15 09:32:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-15 09:32:22 +0200 |
| commit | c16c23addf48fcb3c87e18bcfd4ebcf0d873a30d (patch) | |
| tree | 08eec28f254291186c8256265cc0034555ec02af | |
| parent | a6bb3c4f1b8cb6aabbb01b10f07821c1ea8f9fee (diff) | |
| parent | 47db7804524066e74fd787bdd0d7f2ba8394c220 (diff) | |
| download | PROJ-c16c23addf48fcb3c87e18bcfd4ebcf0d873a30d.tar.gz PROJ-c16c23addf48fcb3c87e18bcfd4ebcf0d873a30d.zip | |
Merge pull request #1424 from rouault/ossfuzz_14248_14250
Ossfuzz 14248 14250
| -rw-r--r-- | src/projections/imw_p.cpp | 2 | ||||
| -rw-r--r-- | src/projections/lcc.cpp | 7 | ||||
| -rw-r--r-- | test/gie/builtins.gie | 11 |
3 files changed, 17 insertions, 3 deletions
diff --git a/src/projections/imw_p.cpp b/src/projections/imw_p.cpp index 8d675318..5455be33 100644 --- a/src/projections/imw_p.cpp +++ b/src/projections/imw_p.cpp @@ -125,7 +125,7 @@ static PJ_LP e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */ } lp.phi = ((lp.phi - Q->phi_1) * (xy.y - yc) / denom) + Q->phi_1; } - if( t.x != 0 || fabs(t.x - xy.x) > TOL ) + if( t.x != 0 && fabs(t.x - xy.x) > TOL ) lp.lam = lp.lam * xy.x / t.x; i ++; } while (i < N_MAX_ITER && diff --git a/src/projections/lcc.cpp b/src/projections/lcc.cpp index aca025be..a101009d 100644 --- a/src/projections/lcc.cpp +++ b/src/projections/lcc.cpp @@ -121,7 +121,12 @@ PJ *PROJECTION(lcc) { if( ml2 == 0 ) { return pj_default_destructor(P, PJD_ERR_LAT_1_OR_2_ZERO_OR_90); } - Q->n /= log(ml1 / ml2); + const double denom = log(ml1 / ml2); + if( denom == 0 ) { + // Not quite, but es is very close to 1... + return pj_default_destructor(P, PJD_ERR_INVALID_ECCENTRICITY); + } + Q->n /= denom; } Q->c = (Q->rho0 = m1 * pow(ml1, -Q->n) / Q->n); Q->rho0 *= (fabs(fabs(P->phi0) - M_HALFPI) < EPS10) ? 0. : diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 7de5fccc..8e82979e 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -2740,10 +2740,19 @@ expect 1 2 ------------------------------------------------------------------------------- operation +proj=lcc +a=9999999 +b=.9 +lat_2=1 -------------------------------------------------------------------------- +------------------------------------------------------------------------------- expect failure errno invalid_eccentricity ------------------------------------------------------------------------------- +# This case is incredible. ossfuzz has found the exact value of lat_1 that +# triggers a division by zero +operation +proj=lcc +lat_1=2D32 +lat_2=0 +a=6378137 +b=0.2 +------------------------------------------------------------------------------- +expect failure +# For some reason fails on MacOSX with a different error +# errno invalid_eccentricity + +------------------------------------------------------------------------------- operation +proj=lcc +ellps=GRS80 +lat_1=0 +lat_2=90 ------------------------------------------------------------------------------- expect failure errno lat_1_or_2_zero_or_90 |