diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2019-04-17 09:46:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-17 09:46:56 +0200 |
| commit | fc395adffc379ec2281288ee4d87a09eca9653bc (patch) | |
| tree | 079853114e40e2340958a370b1e17c7633cfbd66 | |
| parent | c16c23addf48fcb3c87e18bcfd4ebcf0d873a30d (diff) | |
| parent | 8ae2f83174808ac41324c33a749b9cb7ac7eca51 (diff) | |
| download | PROJ-fc395adffc379ec2281288ee4d87a09eca9653bc.tar.gz PROJ-fc395adffc379ec2281288ee4d87a09eca9653bc.zip | |
Merge pull request #1428 from rouault/ossfuzz_14279
omerc: avoid division by zero
| -rw-r--r-- | src/projections/omerc.cpp | 4 | ||||
| -rw-r--r-- | test/gie/builtins.gie | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/projections/omerc.cpp b/src/projections/omerc.cpp index c0278043..e07c209e 100644 --- a/src/projections/omerc.cpp +++ b/src/projections/omerc.cpp @@ -201,6 +201,10 @@ PJ *PROJECTION(omerc) { L = pow(pj_tsfn(phi2, sin(phi2), P->e), Q->B); F = Q->E / H; p = (L - H) / (L + H); + if( p == 0 ) { + // Not quite, but es is very close to 1... + return pj_default_destructor(P, PJD_ERR_INVALID_ECCENTRICITY); + } J = Q->E * Q->E; J = (J - L * H) / (J + L * H); if ((con = lam1 - lam2) < -M_PI) diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 8e82979e..631767a3 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -4005,6 +4005,11 @@ operation +proj=omerc +lat_1=0.1 +a=6400000 +b=1 ------------------------------------------------------------------------------- expect failure errno invalid_eccentricity +------------------------------------------------------------------------------- +operation +proj=omerc +lat_1=0.8 +a=6400000 +b=.4 +------------------------------------------------------------------------------- +expect failure errno invalid_eccentricity + =============================================================================== Ortelius Oval |