Merge pull request #1340 from rouault/fix_ossfuzz_13827

aea: avoid division by zero
OSGeo · Mar 21, 2019 · bf14355 · bf14355
2 parents 5d74522 + ab19f0d
commit bf14355
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/projections/aea.cpp b/src/projections/aea.cpp
@@ -180,6 +180,10 @@ static PJ *setup(PJ *P) {
                 return destructor(P, 0);
 
             Q->n = (m1 * m1 - m2 * m2) / (ml2 - ml1);
+            if (Q->n == 0) {
+                // Not quite, but es is very close to 1...
+                return destructor(P, PJD_ERR_ECCENTRICITY_IS_ONE_OR_GREATER);
+            }
         }
         Q->ec = 1. - .5 * P->one_es * log((1. - P->e) /
             (1. + P->e)) / P->e;

diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
@@ -69,6 +69,11 @@ expect  failure errno lat_larger_than_90
 operation +proj=aea +ellps=GRS80 +lat_2=900
 expect  failure errno lat_larger_than_90
 
+-------------------------------------------------------------------------------
+operation +proj=aea +a=9999999 +b=.9 +lat_2=1
+-------------------------------------------------------------------------
+expect     failure errno eccentricity_is_one
+
 ===============================================================================
 Azimuthal Equidistant
 	Azi, Sph&Ell