diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2019-04-05 15:41:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-05 15:41:28 +0200 |
| commit | 0ea2b4e82700ba9aa0ae67ec0ee72ae58bc4f0c9 (patch) | |
| tree | a602774d5e52071f006b37d59147708a4b57739e /src/projections/lcc.cpp | |
| parent | 1e2e512f9a671df504f6f01eee53dc26939b3c0a (diff) | |
| parent | f6ba932a8f1d7f0775d4ebe367b2d5faef57461a (diff) | |
| download | PROJ-0ea2b4e82700ba9aa0ae67ec0ee72ae58bc4f0c9.tar.gz PROJ-0ea2b4e82700ba9aa0ae67ec0ee72ae58bc4f0c9.zip | |
Merge pull request #1411 from rouault/ossfuzz_14044_and_all
Ossfuzz 14044 and others
Diffstat (limited to 'src/projections/lcc.cpp')
| -rw-r--r-- | src/projections/lcc.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/projections/lcc.cpp b/src/projections/lcc.cpp index 55d28b80..8cc743a9 100644 --- a/src/projections/lcc.cpp +++ b/src/projections/lcc.cpp @@ -113,7 +113,7 @@ PJ *PROJECTION(lcc) { Q->n = log(m1 / pj_msfn(sinphi, cos(Q->phi2), P->es)); if (Q->n == 0) { // Not quite, but es is very close to 1... - return pj_default_destructor(P, PJD_ERR_ECCENTRICITY_IS_ONE_OR_GREATER); + return pj_default_destructor(P, PJD_ERR_INVALID_ECCENTRICITY); } const double ml2 = pj_tsfn(Q->phi2, sinphi, P->e); if( ml2 == 0 ) { @@ -125,6 +125,9 @@ PJ *PROJECTION(lcc) { Q->rho0 *= (fabs(fabs(P->phi0) - M_HALFPI) < EPS10) ? 0. : pow(pj_tsfn(P->phi0, sin(P->phi0), P->e), Q->n); } else { + if( fabs(cosphi) < EPS10 || fabs(cos(Q->phi2)) < EPS10 ) { + return pj_default_destructor(P, PJD_ERR_LAT_1_OR_2_ZERO_OR_90); + } if (secant) Q->n = log(cosphi / cos(Q->phi2)) / log(tan(M_FORTPI + .5 * Q->phi2) / |