Merge pull request #1322 from rouault/ossfuzz_fixes

Various ossfuzz fixes

4 files changed, 75 insertions, 4 deletions

diff --git a/test/gie/4D-API_cs2cs-style.gie b/test/gie/4D-API_cs2cs-style.gie
index bcdc256f..424501cc 100644
--- a/test/gie/4D-API_cs2cs-style.gie
+++ b/test/gie/4D-API_cs2cs-style.gie
@@ -185,7 +185,7 @@ operation proj=pipeline
                       k_0=1 x_0=2600000 y_0=1200000 ellps=bessel units=m
 -------------------------------------------------------------------------------
 tolerance 20 cm
-accept    7.438632495 46.951082877
+accept    7.438632495 46.951082877 0
 expect    2600000.0  1200000.0
 -------------------------------------------------------------------------------
 
diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
index 15bbaf05..32aad873 100644
--- a/test/gie/builtins.gie
+++ b/test/gie/builtins.gie
@@ -63,6 +63,11 @@ expect  -0.001790494 0.000895246
 accept  -200 -100
 expect  -0.001790493 -0.000895247
 
+operation +proj=aea +ellps=GRS80 +lat_1=900
+expect  failure errno lat_larger_than_90
+
+operation +proj=aea +ellps=GRS80 +lat_2=900
+expect  failure errno lat_larger_than_90
 
 ===============================================================================
 Azimuthal Equidistant
@@ -1850,7 +1855,7 @@ Hammer & Eckert-Greifendorff
 ===============================================================================
 
 -------------------------------------------------------------------------------
-operation +proj=hammer   +a=6400000    +lat_1=0.5 +lat_2=2
+operation +proj=hammer   +a=6400000
 -------------------------------------------------------------------------------
 tolerance 0.1 mm
 accept  2 1
@@ -1873,6 +1878,12 @@ accept  -200 -100
 expect  -0.001790493 -0.000895247
 
 
+-------------------------------------------------------------------------------
+operation +proj=hammer   +a=6400000 +W=1
+-------------------------------------------------------------------------------
+accept  -180 0
+expect  failure errno tolerance_condition
+
 ===============================================================================
 Hatano Asymmetrical Equal Area
 	PCyl, Sph.
@@ -4698,7 +4709,7 @@ Oblique Stereographic Alternative
 ===============================================================================
 
 -------------------------------------------------------------------------------
-operation +proj=sterea   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5
+operation +proj=sterea   +ellps=GRS80
 -------------------------------------------------------------------------------
 tolerance 0.1 mm
 accept  2 1
@@ -4721,7 +4732,7 @@ accept  -200 -100
 expect  -0.001796631 -0.000904369
 
 -------------------------------------------------------------------------------
-operation +proj=sterea   +R=6400000    +lat_1=0.5 +lat_2=2 +n=0.5
+operation +proj=sterea   +R=6400000
 -------------------------------------------------------------------------------
 tolerance 0.1 mm
 accept  2 1
@@ -4743,6 +4754,58 @@ expect  -0.001790493 0.000895247
 accept  -200 -100
 expect  -0.001790493 -0.000895247
 
+-------------------------------------------------------------------------------
+operation +proj=sterea   +ellps=GRS80    +lat_0=90
+-------------------------------------------------------------------------------
+tolerance 0.1 mm
+accept  0 90
+expect  0 0
+accept  0 89
+expect  0.000000000000   -111696.700323081997
+accept  0 45
+expect  0.000000000000   -5291160.727484324016
+accept  0 0
+expect  0.000000000000   -12713600.098641794175
+
+-------------------------------------------------------------------------------
+operation +proj=sterea   +ellps=GRS80    +lat_0=89
+-------------------------------------------------------------------------------
+tolerance 0.1 mm
+accept  0 90
+expect  0.000000000000   111696.700314355621
+accept  0 89
+expect  0.000000000000   0
+accept  0 45
+expect  0.000000000000   -5160845.342319893651
+accept  0 0
+expect  0.000000000000   -12493602.143489977345
+
+-------------------------------------------------------------------------------
+operation +proj=sterea   +ellps=GRS80    +lat_0=-90
+-------------------------------------------------------------------------------
+tolerance 0.1 mm
+accept  0 -90
+expect  0 0
+accept  0 -89
+expect  0.000000000000   111696.700323081997
+accept  0 -45
+expect  0.000000000000   5291160.727484324016
+accept  0 0
+expect  0.000000000000   12713600.098641794175
+
+-------------------------------------------------------------------------------
+operation +proj=sterea   +ellps=GRS80   +lat_0=-89
+-------------------------------------------------------------------------------
+tolerance 0.1 mm
+accept  0 -90
+expect  0.000000000000   -111696.700314355621
+accept  0 -89
+expect  0.000000000000   0
+accept  0 -45
+expect  0.000000000000   5160845.342319893651
+accept  0 0
+expect  0.000000000000   12493602.143489977345
+
 
 ===============================================================================
 Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion)
diff --git a/test/gie/ellipsoid.gie b/test/gie/ellipsoid.gie
index 2a6d02a5..2a7bdd60 100644
--- a/test/gie/ellipsoid.gie
+++ b/test/gie/ellipsoid.gie
@@ -67,6 +67,9 @@ expect    failure errno major_axis_not_given
 operation proj=merc +R=0
 expect    failure errno major_axis_not_given
 
+operation +proj=merc +R_a +a=2 +f=2
+expect  failure errno major_axis_not_given
+
 operation
 expect    failure
 operation cobra
diff --git a/test/gie/more_builtins.gie b/test/gie/more_builtins.gie
index d1c978a3..e16443d4 100644
--- a/test/gie/more_builtins.gie
+++ b/test/gie/more_builtins.gie
@@ -433,6 +433,11 @@ expect     failure   errno invalid_arg
 operation  proj=helmert transpose
 expect     failure   errno invalid_arg
 
+# Use of 2D Helmert interface with 3D Helmert setup
+operation  +proj=ob_tran +o_proj=helmert +o_lat_p=0
+direction  inverse
+accept     0 0
+expect     failure   errno 22
 
 -------------------------------------------------------------------------------
 Molodensky-Badekas from IOGP Guidance 7.2, Transformation from La Canoa to REGVEN