Skip to content

Fix heap-buffer-overflow in getCharts() for cross-chart vertices #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jdumas wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −3
Open

Fix heap-buffer-overflow in getCharts() for cross-chart vertices #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions include/Src/AtlasCharts.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,26 @@ const
atlasCharts[ ChartIndex(i) ].maxCorner = Point2D< GeometryReal >(0,0);
}

// The map taking a vertex index in the atlas and giving the index of the corresponding vertex within the chart
// The map taking a vertex index in the atlas and giving the index of the corresponding vertex within the chart.
// Also track which chart the vertex was assigned to, so that vertices shared between charts (pinch points)
// are correctly added to each chart independently.
std::vector< unsigned int > chartVertexID( SimpleTriangleMesh< GeometryReal , 2 >::vertices.size() , static_cast< unsigned int >(-1) );
std::vector< unsigned int > chartVertexChart( SimpleTriangleMesh< GeometryReal , 2 >::vertices.size() , static_cast< unsigned int >(-1) );

for( unsigned int t=0 ; t<SimpleTriangleMesh< GeometryReal , 2 >::triangles.size() ; t++ )
{
AtlasChart< GeometryReal > &atlasChart = atlasCharts[ triangleToChart( AtlasMeshTriangleIndex( t ) ) ];
unsigned int chartIdx = static_cast< unsigned int >( triangleToChart( AtlasMeshTriangleIndex( t ) ) );
AtlasChart< GeometryReal > &atlasChart = atlasCharts[ ChartIndex( chartIdx ) ];

SimplexIndex< 2 > tri;
for( unsigned int k=0 ; k<3 ; k++ )
{
atlasChart._chartHalfEdgeToAtlasEdge.push_back( halfEdgeToEdge( AtlasMeshHalfEdgeIndex( 3*t+k ) ) );
unsigned int v = SimpleTriangleMesh< GeometryReal , 2 >::triangles[t][k];
if( chartVertexID[v]==-1 )
if( chartVertexID[v]==static_cast< unsigned int >(-1) || chartVertexChart[v]!=chartIdx )
{
chartVertexID[v] = (unsigned int)atlasChart.vertices.size();
chartVertexChart[v] = chartIdx;
Point2D< GeometryReal > vertexPos = SimpleTriangleMesh< GeometryReal , 2 >::vertices[v];
for( unsigned int c=0 ; c<2 ; c++ )
{
Expand Down