diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-25 08:34:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 08:34:16 +0100 |
| commit | 56784e70f3903cd1a0a7a3d47dfef7f837400d28 (patch) | |
| tree | be1b9edddd34449a542d4da15c1a4c021d95a849 /src/projections/lcc.cpp | |
| parent | e1e0cfdf88b17b1e9fc5e9f81e0619a4cf1a511b (diff) | |
| parent | 2e60df106deba4455089143e5ae0a4ea1858a3e1 (diff) | |
| download | PROJ-56784e70f3903cd1a0a7a3d47dfef7f837400d28.tar.gz PROJ-56784e70f3903cd1a0a7a3d47dfef7f837400d28.zip | |
Merge pull request #1359 from rouault/fix_ossfuzz_13892_and_others
Fix ossfuzz 13892, 13893, 13894, 13895
Diffstat (limited to 'src/projections/lcc.cpp')
| -rw-r--r-- | src/projections/lcc.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/projections/lcc.cpp b/src/projections/lcc.cpp index 5eee0d14..55d28b80 100644 --- a/src/projections/lcc.cpp +++ b/src/projections/lcc.cpp @@ -105,6 +105,9 @@ PJ *PROJECTION(lcc) { m1 = pj_msfn(sinphi, cosphi, P->es); ml1 = pj_tsfn(Q->phi1, sinphi, P->e); + if( ml1 == 0 ) { + return pj_default_destructor(P, PJD_ERR_LAT_1_OR_2_ZERO_OR_90); + } if (secant) { /* secant cone */ sinphi = sin(Q->phi2); Q->n = log(m1 / pj_msfn(sinphi, cos(Q->phi2), P->es)); @@ -112,7 +115,11 @@ PJ *PROJECTION(lcc) { // Not quite, but es is very close to 1... return pj_default_destructor(P, PJD_ERR_ECCENTRICITY_IS_ONE_OR_GREATER); } - Q->n /= log(ml1 / pj_tsfn(Q->phi2, sinphi, P->e)); + const double ml2 = pj_tsfn(Q->phi2, sinphi, P->e); + if( ml2 == 0 ) { + return pj_default_destructor(P, PJD_ERR_LAT_1_OR_2_ZERO_OR_90); + } + Q->n /= log(ml1 / ml2); } Q->c = (Q->rho0 = m1 * pow(ml1, -Q->n) / Q->n); Q->rho0 *= (fabs(fabs(P->phi0) - M_HALFPI) < EPS10) ? 0. : |