diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-17 08:10:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-17 08:10:20 +0100 |
| commit | bf609ea9ae605d3cf3ce76307f92712b75f01e47 (patch) | |
| tree | f03df01ad362004340826a19c5d28d3b317792b7 /src/projections/hammer.cpp | |
| parent | eab22791b80615e3ad77040423f70205cd7a061d (diff) | |
| parent | c6f41f0176d744de5de1ca48e764148ed18e6489 (diff) | |
| download | PROJ-bf609ea9ae605d3cf3ce76307f92712b75f01e47.tar.gz PROJ-bf609ea9ae605d3cf3ce76307f92712b75f01e47.zip | |
Merge pull request #1322 from rouault/ossfuzz_fixes
Various ossfuzz fixes
Diffstat (limited to 'src/projections/hammer.cpp')
| -rw-r--r-- | src/projections/hammer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/projections/hammer.cpp b/src/projections/hammer.cpp index aa7d1ba9..b2e56a2c 100644 --- a/src/projections/hammer.cpp +++ b/src/projections/hammer.cpp @@ -24,7 +24,14 @@ static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); double cosphi, d; - d = sqrt(2./(1. + (cosphi = cos(lp.phi)) * cos(lp.lam *= Q->w))); + cosphi = cos(lp.phi); + lp.lam *= Q->w; + double denom = 1. + cosphi * cos(lp.lam); + if( denom == 0.0 ) { + proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION); + return proj_coord_error().xy; + } + d = sqrt(2./denom); xy.x = Q->m * d * cosphi * sin(lp.lam); xy.y = Q->rm * d * sin(lp.phi); return xy; |