From 1b0c6fbc8b90522983b18772303ff517dec21cd5 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 22 Apr 2019 18:01:09 +0200 Subject: airy: avoid division by zero Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14410 Credit to OSS Fuzz --- src/projections/airy.cpp | 4 ++++ test/gie/builtins.gie | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/projections/airy.cpp b/src/projections/airy.cpp index f7068061..ba6a40ff 100644 --- a/src/projections/airy.cpp +++ b/src/projections/airy.cpp @@ -79,6 +79,10 @@ static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ } if (fabs(s = 1. - cosz) > EPS) { t = 0.5 * (1. + cosz); + if(t == 0) { + proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION); + return xy; + } Krho = -log(t)/s - Q->Cb / t; } else Krho = 0.5 - Q->Cb; diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 49b135d9..3953a1b6 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -324,7 +324,7 @@ Airy =============================================================================== ------------------------------------------------------------------------------- -operation +proj=airy +a=6400000 +lat_1=0 +lat_2=2 +operation +proj=airy +a=6400000 ------------------------------------------------------------------------------- tolerance 0.1 mm accept 2 1 @@ -404,6 +404,11 @@ expect 0 0 accept 25 25 expect 0.3821 0.4216 +------------------------------------------------------------------------------- +operation +proj=airy +R=1 +no_cut +------------------------------------------------------------------------------- +accept -180 0 +expect failure errno tolerance_condition =============================================================================== Aitoff -- cgit v1.2.3