haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent OOB access in polygon split 

Check for vertex placement against original size.  Since we are
potentially adding vertices that are out of order with the original
polygon, we only want to check against the first set of vertices when
checking for polygon collision

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17664

(cherry picked from commit 8260c174e9)
This commit is contained in:
Seth Hillbrand 2024-04-02 11:19:18 -07:00
parent ce2ea3f3ae
commit e0381f25f7
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/kimath/include/geometry/polygon_triangulation.h
View File

@ -64,7 +64,7 @@ class POLYGON_TRIANGULATION
{ {
public: public:
POLYGON_TRIANGULATION( SHAPE_POLY_SET::TRIANGULATED_POLYGON& aResult ) : POLYGON_TRIANGULATION( SHAPE_POLY_SET::TRIANGULATED_POLYGON& aResult ) :
m_result( aResult ) m_vertices_original_size( 0 ), m_result( aResult )
{}; {};
bool TesselatePolygon( const SHAPE_LINE_CHAIN& aPoly, bool TesselatePolygon( const SHAPE_LINE_CHAIN& aPoly,
@ -86,6 +86,7 @@ public:
wxLogTrace( TRIANGULATE_TRACE, "Created list with %f area", firstVertex->area() ); wxLogTrace( TRIANGULATE_TRACE, "Created list with %f area", firstVertex->area() );
m_vertices_original_size = m_vertices.size();
firstVertex->updateList(); firstVertex->updateList();
/** /**
@ -1019,10 +1020,10 @@ private:
*/ */
bool intersectsPolygon( const VERTEX* a, const VERTEX* b ) const bool intersectsPolygon( const VERTEX* a, const VERTEX* b ) const
{ {
for( auto it = m_vertices.begin(); it != m_vertices.end(); ) for( size_t ii = 0; ii < m_vertices_original_size; ii++ )
{ {
const VERTEX* p = &*it; const VERTEX* p = &m_vertices[ii];
const VERTEX* q = &*( ++it ); const VERTEX* q = &m_vertices[( ii + 1 ) % m_vertices_original_size];
if( p->i == a->i || p->i == b->i || q->i == a->i || q->i == b->i ) if( p->i == a->i || p->i == b->i || q->i == a->i || q->i == b->i )
continue; continue;
@ -1031,15 +1032,9 @@ private:
return true; return true;
} }
if( m_vertices.front().i == a->i || m_vertices.front().i == b->i
|| m_vertices.back().i == a->i || m_vertices.back().i == b->i )
{
return false; return false;
} }
return intersects( a, b, &m_vertices.back(), &m_vertices.front() );
}
/** /**
* Check whether the segment from vertex a -> vertex b is inside the polygon * Check whether the segment from vertex a -> vertex b is inside the polygon
* around the immediate area of vertex a. * around the immediate area of vertex a.
@ -1110,6 +1105,7 @@ private:
private: private:
BOX2I m_bbox; BOX2I m_bbox;
std::deque<VERTEX> m_vertices; std::deque<VERTEX> m_vertices;
size_t m_vertices_original_size;
SHAPE_POLY_SET::TRIANGULATED_POLYGON& m_result; SHAPE_POLY_SET::TRIANGULATED_POLYGON& m_result;
}; };