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

Add defensive code. 

Fixes https://gitlab.com/kicad/code/kicad/issues/4941
This commit is contained in:
Jeff Young 2020-07-25 18:49:03 +01:00
parent acf4756e73
commit 4153309fba
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/router/pns_kicad_iface.cpp
View File

@ -249,9 +249,9 @@ int PNS_PCBNEW_RULE_RESOLVER::localPadClearance( const PNS::ITEM* aItem ) const
int PNS_PCBNEW_RULE_RESOLVER::Clearance( const PNS::ITEM* aA, const PNS::ITEM* aB ) const int PNS_PCBNEW_RULE_RESOLVER::Clearance( const PNS::ITEM* aA, const PNS::ITEM* aB ) const
{ {
int net_a = aA->Net(); int net_a = aA->Net();
int cl_a = ( net_a >= 0 ? m_netClearanceCache[net_a].clearance : m_defaultClearance ); int cl_a = Clearance( net_a );
int net_b = aB->Net(); int net_b = aB->Net();
int cl_b = ( net_b >= 0 ? m_netClearanceCache[net_b].clearance : m_defaultClearance ); int cl_b = Clearance( net_b );
// Pad clearance is 0 if the ITEM* is not a pad // Pad clearance is 0 if the ITEM* is not a pad
int pad_a = localPadClearance( aA ); int pad_a = localPadClearance( aA );
@ -271,6 +271,8 @@ int PNS_PCBNEW_RULE_RESOLVER::Clearance( int aNetCode ) const
{ {
if( aNetCode > 0 && aNetCode < (int) m_netClearanceCache.size() ) if( aNetCode > 0 && aNetCode < (int) m_netClearanceCache.size() )
return m_netClearanceCache[aNetCode].clearance; return m_netClearanceCache[aNetCode].clearance;
else
wxFAIL_MSG( "PNS_PCBNEW_RULE_RESOLVER::Clearance: net not found in clearance cache." );
return m_defaultClearance; return m_defaultClearance;
} }