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

STL is your friend... until it's not. 

Operator[] was creating an empty entry in the connectivity map,
fooling us into thinking the item had already been added.

Worryingly, this bug has been in there since 2017; a recent
change in teardrops just happened to expose it.

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

(cherry picked from commit 7e51077992)
(cherry picked from commit 0d94532df9)
This commit is contained in:
Jeff Young 2023-05-21 17:56:29 +01:00 committed by Seth Hillbrand
parent d894faaeaa
commit b728251bcc
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcbnew/connectivity/connectivity_algo.cpp
View File

@ -119,6 +119,18 @@ bool CN_CONNECTIVITY_ALGO::Add( BOARD_ITEM* aItem )
if( !aItem->IsOnCopperLayer() ) if( !aItem->IsOnCopperLayer() )
return false; return false;
auto alreadyAdded =
[this]( BOARD_ITEM* item )
{
auto it = m_itemMap.find( item );
if( it == m_itemMap.end() )
return false;
// Don't be fooled by an empty ITEM_MAP_ENTRY auto-created by operator[].
return !it->second.GetItems().empty();
};
switch( aItem->Type() ) switch( aItem->Type() )
{ {
case PCB_NETINFO_T: case PCB_NETINFO_T:
@ -132,7 +144,7 @@ bool CN_CONNECTIVITY_ALGO::Add( BOARD_ITEM* aItem )
for( PAD* pad : static_cast<FOOTPRINT*>( aItem )->Pads() ) for( PAD* pad : static_cast<FOOTPRINT*>( aItem )->Pads() )
{ {
if( m_itemMap.find( pad ) != m_itemMap.end() ) if( alreadyAdded( pad ) )
return false; return false;
add( m_itemList, pad ); add( m_itemList, pad );
@ -149,7 +161,7 @@ bool CN_CONNECTIVITY_ALGO::Add( BOARD_ITEM* aItem )
return false; return false;
} }
if( m_itemMap.find( aItem ) != m_itemMap.end() ) if( alreadyAdded( aItem ) )
return false; return false;
add( m_itemList, static_cast<PAD*>( aItem ) ); add( m_itemList, static_cast<PAD*>( aItem ) );
@ -157,21 +169,21 @@ bool CN_CONNECTIVITY_ALGO::Add( BOARD_ITEM* aItem )
} }
case PCB_TRACE_T: case PCB_TRACE_T:
if( m_itemMap.find( aItem ) != m_itemMap.end() ) if( alreadyAdded( aItem ) )
return false; return false;
add( m_itemList, static_cast<PCB_TRACK*>( aItem ) ); add( m_itemList, static_cast<PCB_TRACK*>( aItem ) );
break; break;
case PCB_ARC_T: case PCB_ARC_T:
if( m_itemMap.find( aItem ) != m_itemMap.end() ) if( alreadyAdded( aItem ) )
return false; return false;
add( m_itemList, static_cast<PCB_ARC*>( aItem ) ); add( m_itemList, static_cast<PCB_ARC*>( aItem ) );
break; break;
case PCB_VIA_T: case PCB_VIA_T:
if( m_itemMap.find( aItem ) != m_itemMap.end() ) if( alreadyAdded( aItem ) )
return false; return false;
add( m_itemList, static_cast<PCB_VIA*>( aItem ) ); add( m_itemList, static_cast<PCB_VIA*>( aItem ) );
@ -181,7 +193,7 @@ bool CN_CONNECTIVITY_ALGO::Add( BOARD_ITEM* aItem )
{ {
ZONE* zone = static_cast<ZONE*>( aItem ); ZONE* zone = static_cast<ZONE*>( aItem );
if( m_itemMap.find( aItem ) != m_itemMap.end() ) if( alreadyAdded( aItem ) )
return false; return false;
m_itemMap[zone] = ITEM_MAP_ENTRY(); m_itemMap[zone] = ITEM_MAP_ENTRY();