Merge pull request #1411 from rouault/ossfuzz_14044_and_all

Ossfuzz 14044 and others

4 files changed, 53 insertions, 10 deletions

diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
index 4184d994..5cbe6325 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
@@ -2115,6 +2115,25 @@ expect  -0.001796699 0.500904924
 accept  -200 -100
 expect  -0.001796698 0.499095076
 
+-------------------------------------------------------------------------------
+operation +proj=imw_p   +ellps=GRS80  +lat_1=0 +lat_2=10
+-------------------------------------------------------------------------------
+tolerance 0.1 mm
+accept  0 0
+expect  0 0
+accept  0.000000000000   0.000904928485
+expect  0 100
+accept  0.000898315284   0.000000000000
+expect  100 0
+
+direction inverse
+accept  0 0
+expect  0 0
+accept  0 100
+expect  0.000000000000   0.000904928485
+accept  100 0
+expect  0.000898315284   0.000000000000
+
 
 ===============================================================================
 Icosahedral Snyder Equal Area
@@ -2248,6 +2267,11 @@ expect  24.830351182 59.756888426
 accept  0 0
 expect  24.833333333333   59.757598563058
 
+-------------------------------------------------------------------------------
+operation +proj=krovak +lat_0=-90
+-------------------------------------------------------------------------------
+expect     failure errno invalid_arg
+
 ===============================================================================
 Laborde
 	Cyl, Sph
@@ -2703,7 +2727,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
@@ -2720,6 +2744,16 @@ operation +proj=lcc +ellps=GRS80 +lat_1=90 +lat_2=90
 -------------------------------------------------------------------------------
 expect     failure errno lat_1_or_2_zero_or_90
 
+-------------------------------------------------------------------------------
+operation +proj=lcc +ellps=sphere +lat_1=0 +lat_2=90
+-------------------------------------------------------------------------------
+expect     failure errno lat_1_or_2_zero_or_90
+
+-------------------------------------------------------------------------------
+operation +proj=lcc +ellps=sphere +lat_1=90 +lat_2=0
+-------------------------------------------------------------------------------
+expect     failure errno lat_1_or_2_zero_or_90
+
 ===============================================================================
 Lambert Conformal Conic Alternative
 	Conic, Sph&Ell
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
diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp
index edf987ba..30e0b427 100644
--- a/test/unit/test_io.cpp
+++ b/test/unit/test_io.cpp
@@ -7334,7 +7334,8 @@ TEST(io, projparse_longlat_axis_neu) {
     auto op = CoordinateOperationFactory::create()->createOperation(
         GeographicCRS::EPSG_4326, NN_NO_CHECK(crs));
     ASSERT_TRUE(op != nullptr);
-    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()), "+proj=noop");
+    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()),
+              "+proj=noop");
 }
 
 // ---------------------------------------------------------------------------
diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp
index c4cafef6..08a3f6ad 100644
--- a/test/unit/test_operation.cpp
+++ b/test/unit/test_operation.cpp
@@ -4504,7 +4504,8 @@ TEST(operation, geogCRS_to_geogCRS_noop) {
         GeographicCRS::EPSG_4326, GeographicCRS::EPSG_4326);
     ASSERT_TRUE(op != nullptr);
     EXPECT_EQ(op->nameStr(), "Null geographic offset from WGS 84 to WGS 84");
-    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()), "+proj=noop");
+    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()),
+              "+proj=noop");
     EXPECT_EQ(op->inverse()->nameStr(), op->nameStr());
 }
 
@@ -4845,7 +4846,8 @@ TEST(operation, geocentricCRS_to_geocentricCRS_noop) {
     ASSERT_TRUE(op != nullptr);
     EXPECT_EQ(op->nameStr(),
               "Ballpark geocentric translation from WGS 84 to WGS 84");
-    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()), "+proj=noop");
+    EXPECT_EQ(op->exportToPROJString(PROJStringFormatter::create().get()),
+              "+proj=noop");
     EXPECT_EQ(op->inverse()->nameStr(), op->nameStr());
 }