From 70ed3efe60718be74d73d92ec2d121e2de268e53 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 4 Apr 2019 22:36:00 +0200 Subject: Reject negative e parameter to avoid division by zero Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14044 Credit to OSS Fuzz --- test/gie/builtins.gie | 4 ++-- test/gie/ellipsoid.gie | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 4184d994..6976aaca 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -72,7 +72,7 @@ expect failure errno lat_larger_than_90 ------------------------------------------------------------------------------- operation +proj=aea +a=9999999 +b=.9 +lat_2=1 ------------------------------------------------------------------------- -expect failure errno eccentricity_is_one +expect failure errno invalid_eccentricity =============================================================================== Azimuthal Equidistant @@ -2703,7 +2703,7 @@ expect 1 2 ------------------------------------------------------------------------------- operation +proj=lcc +a=9999999 +b=.9 +lat_2=1 ------------------------------------------------------------------------- -expect failure errno eccentricity_is_one +expect failure errno invalid_eccentricity ------------------------------------------------------------------------------- operation +proj=lcc +ellps=GRS80 +lat_1=0 +lat_2=90 diff --git a/test/gie/ellipsoid.gie b/test/gie/ellipsoid.gie index 8099cfbd..b84a512f 100644 --- a/test/gie/ellipsoid.gie +++ b/test/gie/ellipsoid.gie @@ -44,7 +44,7 @@ tolerance 10 nm accept 1 2 expect 111319.4907932736 221194.0771604237 -accept 12 55 +accept 12 55s expect 1335833.8895192828 7326837.7148738774 ------------------------------------------------------------------------------- @@ -134,17 +134,23 @@ Shape parameters operation proj=utm zone=32 ellps=GRS80 rf=0 expect failure errno rev_flattening_is_zero +operation proj=utm zone=32 ellps=GRS80 e=-0.5 +expect failure errno invalid_eccentricity + +operation proj=utm zone=32 ellps=GRS80 e=1 +expect failure errno invalid_eccentricity + operation proj=utm zone=32 ellps=GRS80 es=1 -expect failure errno eccentricity_is_one +expect failure errno invalid_eccentricity operation proj=utm zone=32 a=1 es=1.1 -expect failure errno eccentricity_is_one +expect failure errno invalid_eccentricity operation proj=utm zone=32 ellps=GRS80 b=0 -expect failure errno eccentricity_is_one +expect failure errno invalid_eccentricity operation proj=utm zone=32 ellps=GRS80 f=1 -expect failure errno eccentricity_is_one +expect failure errno invalid_eccentricity operation proj=utm zone=32 ellps=GRS80 b=6000000 accept 12 55 -- cgit v1.2.3