Check that number of points passed to wxDC::DrawSpline() is at least 2

DoDrawSpline() implementations for all ports work for the number of points
>= 2 (for 2 points there is drawn a straight line) so we need to add checks
whether this requirement is met.

See #19172.
This commit is contained in:
Artur Wieczorek
2021-06-30 22:20:39 +02:00
parent a3988c8db6
commit b35d595e5d
6 changed files with 12 additions and 11 deletions

View File

@@ -846,6 +846,8 @@ void wxGCDCImpl::DoDrawLines(int n, const wxPoint points[],
void wxGCDCImpl::DoDrawSpline(const wxPointList *points)
{
wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawSpline - invalid DC") );
wxCHECK_RET(points, "NULL pointer to spline points?");
wxCHECK_RET(points->GetCount() >= 2, "incomplete list of spline points?");
if ( !m_logicalFunctionSupported )
return;
@@ -853,10 +855,6 @@ void wxGCDCImpl::DoDrawSpline(const wxPointList *points)
wxGraphicsPath path = m_graphicContext->CreatePath();
wxPointList::compatibility_iterator node = points->GetFirst();
if ( !node )
// empty list
return;
const wxPoint *p = node->GetData();
wxCoord x1 = p->x;