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

router: prevent heap crash when initial walkaround line is empty

This commit is contained in:
Tomasz Wlostowski 2020-07-22 23:06:53 +02:00
parent 1a2e02040a
commit c2b9db293f
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pcbnew/router/pns_walkaround.cpp
View File

@ -63,27 +63,30 @@ WALKAROUND::WALKAROUND_STATUS WALKAROUND::singleStep( LINE& aPath,
SHAPE_LINE_CHAIN path_pre[2], path_walk[2], path_post[2]; SHAPE_LINE_CHAIN path_pre[2], path_walk[2], path_post[2];
VECTOR2I last = aPath.CPoint( -1 ); if( aPath.PointCount() > 1 )
if( ( current_obs->m_hull ).PointInside( last ) || ( current_obs->m_hull ).PointOnEdge( last ) )
{ {
m_recursiveBlockageCount++; VECTOR2I last = aPath.CPoint( -1 );
if( m_recursiveBlockageCount < 3 ) if( ( current_obs->m_hull ).PointInside( last ) || ( current_obs->m_hull ).PointOnEdge( last ) )
aPath.Line().Append( current_obs->m_hull.NearestPoint( last ) );
else
{ {
aPath = aPath.ClipToNearestObstacle( m_world ); m_recursiveBlockageCount++;
return DONE;
if( m_recursiveBlockageCount < 3 )
aPath.Line().Append( current_obs->m_hull.NearestPoint( last ) );
else
{
aPath = aPath.ClipToNearestObstacle( m_world );
return DONE;
}
} }
} }
aPath.Walkaround( current_obs->m_hull, path_pre[0], path_walk[0], aPath.Walkaround( current_obs->m_hull, path_pre[0], path_walk[0],
path_post[0], aWindingDirection ); path_post[0], aWindingDirection );
aPath.Walkaround( current_obs->m_hull, path_pre[1], path_walk[1], aPath.Walkaround( current_obs->m_hull, path_pre[1], path_walk[1],
path_post[1], !aWindingDirection ); path_post[1], !aWindingDirection );
if( ! aPath.Walkaround( current_obs->m_hull, path_pre[1], path_walk[1], if( !aPath.Walkaround( current_obs->m_hull, path_pre[1], path_walk[1],
path_post[1], !aWindingDirection ) ) path_post[1], !aWindingDirection ) )
return STUCK; return STUCK;
auto l =aPath.CLine(); auto l =aPath.CLine();