aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-03-20 17:25:46 +0000
committerEven Rouault <even.rouault@spatialys.com>2019-03-20 17:25:46 +0000
commit3a5ccffe86d2d7157a4c45d3bb0752dfdc50da6d (patch)
tree20e1700ec98f2803d36fc80681434586f9feb2ef /src
parentb702580dc7da27ba448027792dcfc5491fb8b475 (diff)
downloadPROJ-3a5ccffe86d2d7157a4c45d3bb0752dfdc50da6d.tar.gz
PROJ-3a5ccffe86d2d7157a4c45d3bb0752dfdc50da6d.zip
pj_calc_ellipsoid_params(): reject f=1
To avoid division by zero of b. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13830 Credit to OSS Fuzz
Diffstat (limited to 'src')
-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 */