aboutsummaryrefslogtreecommitdiff
path: root/src/ell_set.cpp
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2019-03-21 08:27:37 +0100
committerGitHub <noreply@github.com>2019-03-21 08:27:37 +0100
commitdc1f9d8ba25d3fd35ef767e18903ac9dad91e7e3 (patch)
tree41442c2b864d89aaf2b308d1f09735cd6461e5d6 /src/ell_set.cpp
parent9ead1bfe5afd7e519fe5f83b6603e5147fa91411 (diff)
parent17f2f7cf8bcaa5a4edc9e94d2bd6d8e633455c03 (diff)
downloadPROJ-dc1f9d8ba25d3fd35ef767e18903ac9dad91e7e3.tar.gz
PROJ-dc1f9d8ba25d3fd35ef767e18903ac9dad91e7e3.zip
Merge pull request #1335 from rouault/fix_ossfuzz_13790
Fix ossfuzz 13790 + tweak CI regarding backport branches
Diffstat (limited to 'src/ell_set.cpp')
-rw-r--r--src/ell_set.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ell_set.cpp b/src/ell_set.cpp
index 386b4f46..d0714bee 100644
--- a/src/ell_set.cpp
+++ b/src/ell_set.cpp
@@ -542,6 +542,10 @@ int pj_calc_ellipsoid_params (PJ *P, double a, double es) {
/* flattening */
if (0==P->f)
P->f = 1 - cos (P->alpha); /* = 1 - sqrt (1 - PIN->es); */
+ if (P->f == 1.0) {
+ pj_ctx_set_errno( P->ctx, PJD_ERR_ECCENTRICITY_IS_ONE_OR_GREATER);
+ return PJD_ERR_ECCENTRICITY_IS_ONE_OR_GREATER;
+ }
P->rf = P->f != 0.0 ? 1.0/P->f: HUGE_VAL;
/* second flattening */