Fix crash during import of surface data

ApplicationLibCode/FileInterface/RifSurfaceImporter.cpp

@@ -600,17 +600,33 @@ bool RifSurfaceImporter::generateTriangleIndices( const std::vector<std::vector<
                                                   std::vector<unsigned>&                    triangleIndices,
                                                   unsigned                                  resolution /*= 1 */ )
 {
+    if ( i >= indexToPointData.size() || j >= indexToPointData[i].size() )
+    {
+        return false;
+    }
+
     unsigned topI = unsigned( std::min( indexToPointData.size() - 1, i + resolution ) );
+    if ( topI >= indexToPointData.size() )
+    {
+        return false;
+    }
+
     unsigned topJ = unsigned( std::min( indexToPointData[topI].size() - 1, j + resolution ) );
+    if ( topJ >= indexToPointData[topI].size() || topJ >= indexToPointData[i].size() )
+    {
+        return false;
+    }
 
+    // Prevent degenerate cases
     if ( topI == i || topJ == j ) return false;
 
-    unsigned q1 = indexToPointData[i + 0][j + 0];
-    unsigned q2 = indexToPointData[i + 0][topJ];
-    unsigned q3 = indexToPointData[topI][j + 0];
+    unsigned q1 = indexToPointData[i][j];
+    unsigned q2 = indexToPointData[i][topJ];
+    unsigned q3 = indexToPointData[topI][j];
     unsigned q4 = indexToPointData[topI][topJ];
 
-    if ( q1 != ( (unsigned)-1 ) && q2 != ( (unsigned)-1 ) && q3 != ( (unsigned)-1 ) && q4 != ( (unsigned)-1 ) )
+    const auto invalidIndex = static_cast<unsigned>( -1 );
+    if ( q1 != invalidIndex && q2 != invalidIndex && q3 != invalidIndex && q4 != invalidIndex )
     {
         triangleIndices.push_back( q1 );
         triangleIndices.push_back( q2 );
@@ -620,10 +636,8 @@ bool RifSurfaceImporter::generateTriangleIndices( const std::vector<std::vector<
         triangleIndices.push_back( q3 );
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/FileInterface/RifSurfaceImporter.h

@@ -36,12 +36,13 @@ class RifSurfaceImporter
     static std::pair<std::vector<cvf::Vec3d>, std::vector<unsigned>> readOpenWorksXyzFile( const QString& filename,
                                                                                            double         preferredPointDistance );
 
-private:
     static bool generateTriangleIndices( const std::vector<std::vector<unsigned>>& indexToPointData,
                                          const size_t&                             i,
                                          const size_t&                             j,
                                          std::vector<unsigned>&                    triangleIndices,
                                          unsigned                                  resolution = 1 );
+
+private:
     static bool
         vectorFuzzyCompare( const cvf::Vec2d& vector1, const cvf::Vec2d& vector2, double epsilon = std::numeric_limits<double>::epsilon() );
 };

ApplicationLibCode/UnitTests/RifSurfaceImporter-Test.cpp

@@ -233,6 +233,34 @@ TEST( RifSurfaceImporter, ReadTinyOpenWorksXyzFile )
     }
 }
 
+TEST( RifSurfaceImporter, ReadTinyOpenWorksXyzFileTabs )
+{
+    QDir baseFolder( TEST_DATA_DIR );
+
+    QString filename( "RifSurfaceImporter/tiny-test-tabs.dat" );
+    QString filePath = baseFolder.absoluteFilePath( filename );
+    EXPECT_TRUE( QFile::exists( filePath ) );
+
+    auto surface = RifSurfaceImporter::readOpenWorksXyzFile( filePath, 0.1 );
+
+    auto vertices = surface.first;
+    auto indices  = surface.second;
+
+    EXPECT_EQ( (size_t)15, vertices.size() );
+    EXPECT_EQ( (size_t)24, indices.size() );
+
+    if ( !indices.empty() )
+    {
+        EXPECT_EQ( (size_t)0, indices.front() );
+        EXPECT_EQ( (size_t)11, indices.back() );
+
+        for ( size_t i = 0; i < indices.size(); i++ )
+        {
+            EXPECT_TRUE( indices[i] != ( (unsigned)-1 ) );
+        }
+    }
+}
+
 TEST( RifSurfaceImporter, ReadLargeOpenWorksXyzFile )
 {
     QDir baseFolder( TEST_DATA_DIR );
@@ -260,3 +288,67 @@ TEST( RifSurfaceImporter, ReadLargeOpenWorksXyzFile )
         }
     }
 }
+
+// Test fixture for RifSurfaceImporter
+class RifSurfaceImporterTest : public ::testing::Test
+{
+protected:
+    RifSurfaceImporter                 rifSurfaceImporter;
+    std::vector<std::vector<unsigned>> indexToPointData;
+    std::vector<unsigned>              triangleIndices;
+};
+
+TEST_F( RifSurfaceImporterTest, HandlesEmptyInput )
+{
+    // Empty indexToPointData
+    indexToPointData = {};
+    EXPECT_FALSE( rifSurfaceImporter.generateTriangleIndices( indexToPointData, 0, 0, triangleIndices ) );
+    EXPECT_TRUE( triangleIndices.empty() );
+}
+
+TEST_F( RifSurfaceImporterTest, HandlesOutOfBoundsInput )
+{
+    // Non-empty indexToPointData but invalid indices
+    indexToPointData = { { 0, 1 }, { 2, 3 } };
+    EXPECT_FALSE( rifSurfaceImporter.generateTriangleIndices( indexToPointData, 2, 0, triangleIndices ) );
+    EXPECT_FALSE( rifSurfaceImporter.generateTriangleIndices( indexToPointData, 0, 2, triangleIndices ) );
+    EXPECT_TRUE( triangleIndices.empty() );
+}
+
+TEST_F( RifSurfaceImporterTest, HandlesSingleResolution )
+{
+    // Valid input with resolution 1
+    indexToPointData = { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 } };
+    EXPECT_TRUE( rifSurfaceImporter.generateTriangleIndices( indexToPointData, 0, 0, triangleIndices, 1 ) );
+
+    // Check expected triangle indices
+    std::vector<unsigned> expected = { 0, 1, 4, 0, 4, 3 };
+    EXPECT_EQ( triangleIndices, expected );
+}
+
+TEST_F( RifSurfaceImporterTest, HandlesLargerResolution )
+{
+    // Valid input with larger resolution
+    indexToPointData = { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 } };
+    EXPECT_TRUE( rifSurfaceImporter.generateTriangleIndices( indexToPointData, 0, 0, triangleIndices, 2 ) );
+
+    // Check expected triangle indices
+    std::vector<unsigned> expected = { 0, 2, 8, 0, 8, 6 };
+    EXPECT_EQ( triangleIndices, expected );
+}
+
+TEST_F( RifSurfaceImporterTest, HandlesInvalidPoints )
+{
+    // Input with invalid points (-1 as unsigned max value)
+    indexToPointData = { { 0, 1, 2 }, { 3, (unsigned)-1, 5 }, { 6, 7, 8 } };
+    EXPECT_FALSE( rifSurfaceImporter.generateTriangleIndices( indexToPointData, 0, 1, triangleIndices ) );
+    EXPECT_TRUE( triangleIndices.empty() );
+}
+
+TEST_F( RifSurfaceImporterTest, PreventsDegenerateTriangles )
+{
+    // Degenerate case where resolution leads to topI == i or topJ == j
+    indexToPointData = { { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 } };
+    EXPECT_FALSE( rifSurfaceImporter.generateTriangleIndices( indexToPointData, 2, 2, triangleIndices, 1 ) );
+    EXPECT_TRUE( triangleIndices.empty() );
+}

ApplicationLibCode/UnitTests/TestData/RifSurfaceImporter/tiny-test-tabs.dat

@@ -0,0 +1,15 @@
+0	0	0
+0	1	0
+0	2	0
+0	4	0
+2	0	0
+2	1	0
+2	2	0
+2	3	0
+4	1	0
+4	2	0
+6	-2	0
+6	1	0
+6	2	0
+8	3	0
+8	5	0