Merge a871ac5 into aa110d8

OSGeo · Oct 12, 2023 · 3989fe4 · 3989fe4
2 parents aa110d8 + a871ac5
commit 3989fe4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/iso19111/metadata.cpp b/src/iso19111/metadata.cpp
@@ -343,6 +343,13 @@ bool GeographicBoundingBox::Private::intersects(const Private &other) const {
             return false;
         }
 
+        // Bail out on longitudes not in [-180,180]. We could probably make
+        // some sense of them, but this check at least avoid potential infinite
+        // recursion.
+        if (oW > 180 || oE < -180) {
+            return false;
+        }
+
         return intersects(Private(oW, oS, 180.0, oN)) ||
                intersects(Private(-180.0, oS, oE, oN));
 

diff --git a/test/unit/test_metadata.cpp b/test/unit/test_metadata.cpp
@@ -308,15 +308,20 @@ TEST(metadata, extent_edge_cases) {
                  InvalidValueTypeException);
 
     // Scenario of https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=57328
+    // and https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=60084
     {
         auto A = Extent::createFromBBOX(0, 1, 2, 3);
         auto B = Extent::createFromBBOX(200, -80, -100, 80);
+        EXPECT_FALSE(A->intersects(B));
+        EXPECT_FALSE(B->intersects(A));
         EXPECT_TRUE(A->intersection(B) == nullptr);
         EXPECT_TRUE(B->intersection(A) == nullptr);
     }
     {
         auto A = Extent::createFromBBOX(0, 1, 2, 3);
         auto B = Extent::createFromBBOX(100, -80, -200, 80);
+        EXPECT_FALSE(A->intersects(B));
+        EXPECT_FALSE(B->intersects(A));
         EXPECT_TRUE(A->intersection(B) == nullptr);
         EXPECT_TRUE(B->intersection(A) == nullptr);
     }