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

Don't crash when failing to deserialize old exclusions 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/4820
This commit is contained in:
Jon Evans 2020-07-06 12:53:55 -04:00
parent db4502e2ae
commit 2a1550d1d2
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/class_marker_pcb.cpp
View File

@ -77,6 +77,10 @@ MARKER_PCB* MARKER_PCB::Deserialize( const wxString& data )
(int) strtol( props[2].c_str(), nullptr, 10 ) ); (int) strtol( props[2].c_str(), nullptr, 10 ) );
DRC_ITEM* drcItem = DRC_ITEM::Create( props[0] ); DRC_ITEM* drcItem = DRC_ITEM::Create( props[0] );
if( !drcItem )
return nullptr;
drcItem->SetItems( KIID( props[3] ), KIID( props[4] ) ); drcItem->SetItems( KIID( props[3] ), KIID( props[4] ) );
return new MARKER_PCB( drcItem, markerPos ); return new MARKER_PCB( drcItem, markerPos );

2
pcbnew/drc/drc_item.cpp
View File

@ -244,7 +244,7 @@ DRC_ITEM* DRC_ITEM::Create( const wxString& aErrorKey )
return new DRC_ITEM( static_cast<const DRC_ITEM&>( item ) ); return new DRC_ITEM( static_cast<const DRC_ITEM&>( item ) );
} }
wxFAIL_MSG( "Unknown DRC settings key: " + aErrorKey ); // This can happen if a project has old-format exclusions. Just drop these items.
return nullptr; return nullptr;
} }

4
pcbnew/pcb_edit_frame.cpp
View File

@ -531,9 +531,13 @@ void PCB_EDIT_FRAME::ResolveDRCExclusions()
for( const wxString& exclusionData : bds.m_DrcExclusions ) for( const wxString& exclusionData : bds.m_DrcExclusions )
{ {
MARKER_PCB* marker = MARKER_PCB::Deserialize( exclusionData ); MARKER_PCB* marker = MARKER_PCB::Deserialize( exclusionData );
if( marker )
{
marker->SetExcluded( true ); marker->SetExcluded( true );
commit.Add( marker ); commit.Add( marker );
} }
}
bds.m_DrcExclusions.clear(); bds.m_DrcExclusions.clear();