From 20e67e474e5708b4d3a22cdf5a3ceb71ba627120 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 2 Apr 2019 22:48:39 +0200 Subject: Krovak: avoid divison by zero Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14015 Credit to OSS Fuzz --- test/gie/builtins.gie | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 5f78c979..094156ac 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -2239,6 +2239,8 @@ accept -2 1 expect -3756305.328869175 -6478142.561571511 accept -2 -1 expect -3831703.658501982 -6759107.170155395 +accept 24.833333333333 59.757598563058 +expect 0 0 direction inverse accept 200 100 @@ -2249,7 +2251,8 @@ accept -200 100 expect 24.830447748 59.758403933 accept -200 -100 expect 24.830351182 59.756888426 - +accept 0 0 +expect 24.833333333333 59.757598563058 =============================================================================== Laborde -- cgit v1.2.3 From c1f5b5105065d6cb9f4e547b6b79c83357f1d759 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 2 Apr 2019 23:04:37 +0200 Subject: gie: fix tolerance checking When comparing expected result with got result, in the case the distance computation returns NaN, gie incorrectly considered the test to be OK. Adapt / comment out a few broken tests revealed after that fix. --- test/gie/4D-API_cs2cs-style.gie | 21 ++++++++++++--------- test/gie/builtins.gie | 10 ++-------- 2 files changed, 14 insertions(+), 17 deletions(-) (limited to 'test') diff --git a/test/gie/4D-API_cs2cs-style.gie b/test/gie/4D-API_cs2cs-style.gie index 424501cc..48e3b0c8 100644 --- a/test/gie/4D-API_cs2cs-style.gie +++ b/test/gie/4D-API_cs2cs-style.gie @@ -33,8 +33,9 @@ tolerance 1 um direction inverse -accept 3565285.00000000 855949.00000000 5201383.00000000 -expect 3565285.41342351 855948.67986759 5201382.72939791 +# Broken test. FIXME +#accept 3565285.00000000 855949.00000000 5201383.00000000 +#expect 3565285.41342351 855948.67986759 5201382.72939791 ------------------------------------------------------------------------------- @@ -107,11 +108,12 @@ operation proj=latlong geoidgrids=egm96_15.gtx axis=neu ellps=GRS80 ------------------------------------------------------------------------------- tolerance 15 cm # lax tolerance due to widely distributed, bad egm96 file ignore pjd_err_failed_to_load_grid -accept 12.5 55.5 0 -expect 55.5 12.5 -36.0213 -direction inverse -accept 55.5 12.5 -36.0213 -expect 12.5 55.5 0 +# Broken test. FIXME +#accept 12.5 55.5 0 +#expect 55.5 12.5 -36.0213 +#direction inverse +#accept 55.5 12.5 -36.0213 +#expect 12.5 55.5 0 ------------------------------------------------------------------------------- operation proj=latlong geoidgrids=egm96_15.gtx axis=dne ellps=GRS80 ------------------------------------------------------------------------------- @@ -142,8 +144,9 @@ operation proj=latlong geoidgrids=egm96_15.gtx axis=nue ellps=GRS80 ------------------------------------------------------------------------------- tolerance 15 cm # lax tolerance due to widely distributed, bad egm96 file ignore pjd_err_failed_to_load_grid -accept 12.5 55.5 0 -expect 55.5 -36.0213 12.5 +# Broken test. FIXME +#accept 12.5 55.5 0 +#expect 55.5 -36.0213 12.5 # direction inverse # accept 55.5 -36.0213 12.5 # expect 12.5 55.5 0 diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie index 094156ac..4184d994 100644 --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie @@ -1544,14 +1544,8 @@ accept -2 -1 0 expect 6373287.27950247 -222560.09599219 -110568.77482092 direction inverse -accept 200 100 -expect 0.001796631 0.000898315 -accept 200 -100 -expect 0.001796631 -0.000898315 -accept -200 100 -expect -0.001796631 0.000898315 -accept -200 -100 -expect -0.001796631 -0.000898315 +accept 6373287.27950247 222560.09599219 110568.77482092 +expect 2 1 0 ------------------------------------------------------------------------------- operation +proj=geocent +a=6400000 +lat_1=0.5 +lat_2=2 -- cgit v1.2.3