From 96af6dbf69dd38421916438702be80f73276d879 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 5 May 2019 20:28:59 +0200
Subject: geos: avoid division by zero

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14602
Credit to OSS Fuzz
---
 src/projections/nsper.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/projections/nsper.cpp')

diff --git a/src/projections/nsper.cpp b/src/projections/nsper.cpp
index fbf5317b..d641e1b6 100644
--- a/src/projections/nsper.cpp
+++ b/src/projections/nsper.cpp
@@ -148,8 +148,7 @@ static PJ_LP nsper_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, invers
 static PJ *setup(PJ *P) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
 
-    if ((Q->height = pj_param(P->ctx, P->params, "dh").f) <= 0.)
-        return pj_default_destructor(P, PJD_ERR_H_LESS_THAN_ZERO);
+    Q->height = pj_param(P->ctx, P->params, "dh").f;
 
     if (fabs(fabs(P->phi0) - M_HALFPI) < EPS10)
         Q->mode = P->phi0 < 0. ? S_POLE : N_POLE;
@@ -161,6 +160,8 @@ static PJ *setup(PJ *P) {
         Q->cosph0 = cos(P->phi0);
     }
     Q->pn1 = Q->height / P->a; /* normalize by radius */
+    if ( Q->pn1 <= 0 || Q->pn1 > 1e10 )
+        return pj_default_destructor (P, PJD_ERR_INVALID_H);
     Q->p = 1. + Q->pn1;
     Q->rp = 1. / Q->p;
     Q->h = 1. / Q->pn1;
-- 
cgit v1.2.3