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

Fix nullptr dereference in router. 

Fixes https://gitlab.com/kicad/code/kicad/issues/9844
This commit is contained in:
Jeff Young 2021-12-02 13:20:23 +00:00
parent ffe91b31bf
commit 5cb2641142
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/router/pns_kicad_iface.cpp
View File

@ -1416,8 +1416,8 @@ void PNS_KICAD_IFACE::DisplayItem( const PNS::ITEM* aItem, int aClearance, bool
ROUTER_PREVIEW_ITEM* pitem = new ROUTER_PREVIEW_ITEM( aItem, m_view ); ROUTER_PREVIEW_ITEM* pitem = new ROUTER_PREVIEW_ITEM( aItem, m_view );
static KICAD_T tracksOrVias[] = { PCB_TRACE_T, PCB_ARC_T, PCB_VIA_T, EOT }; static int tracks = PNS::ITEM::SEGMENT_T | PNS::ITEM::ARC_T;
static KICAD_T tracks[] = { PCB_TRACE_T, PCB_ARC_T, EOT }; static int tracksOrVias = tracks | PNS::ITEM::VIA_T;
if( aClearance >= 0 ) if( aClearance >= 0 )
{ {
@ -1427,15 +1427,15 @@ void PNS_KICAD_IFACE::DisplayItem( const PNS::ITEM* aItem, int aClearance, bool
{ {
case PCB_DISPLAY_OPTIONS::SHOW_TRACK_CLEARANCE_WITH_VIA_ALWAYS: case PCB_DISPLAY_OPTIONS::SHOW_TRACK_CLEARANCE_WITH_VIA_ALWAYS:
case PCB_DISPLAY_OPTIONS::SHOW_WHILE_ROUTING_OR_DRAGGING: case PCB_DISPLAY_OPTIONS::SHOW_WHILE_ROUTING_OR_DRAGGING:
pitem->ShowClearance( pitem->GetParent()->IsType( tracksOrVias ) ); pitem->ShowClearance( aItem->OfKind( tracksOrVias ) );
break; break;
case PCB_DISPLAY_OPTIONS::SHOW_TRACK_CLEARANCE_WITH_VIA_WHILE_ROUTING: case PCB_DISPLAY_OPTIONS::SHOW_TRACK_CLEARANCE_WITH_VIA_WHILE_ROUTING:
pitem->ShowClearance( pitem->GetParent()->IsType( tracksOrVias ) && !aEdit ); pitem->ShowClearance( aItem->OfKind( tracksOrVias ) && !aEdit );
break; break;
case PCB_DISPLAY_OPTIONS::SHOW_TRACK_CLEARANCE_WHILE_ROUTING: case PCB_DISPLAY_OPTIONS::SHOW_TRACK_CLEARANCE_WHILE_ROUTING:
pitem->ShowClearance( pitem->GetParent()->IsType( tracks ) && !aEdit ); pitem->ShowClearance( aItem->OfKind( tracks ) && !aEdit );
break; break;
default: default: