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

CADSTAR: Fix potential nullptr dereferencing bug 

Don't assume the footprint will have the pad index that the file references.
This commit is contained in:
Roberto Fernandez Bautista 2022-02-05 19:18:49 +00:00
parent 00ba580915
commit 290354e3f6
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
View File

@ -1250,7 +1250,15 @@ PAD* CADSTAR_PCB_ARCHIVE_LOADER::getKiCadPad( const COMPONENT_PAD& aCadstarPad,
PAD*& CADSTAR_PCB_ARCHIVE_LOADER::getPadReference( FOOTPRINT* aFootprint, PAD*& CADSTAR_PCB_ARCHIVE_LOADER::getPadReference( FOOTPRINT* aFootprint,
const PAD_ID aCadstarPadID ) const PAD_ID aCadstarPadID )
{ {
return aFootprint->Pads().at( aCadstarPadID - (long long) 1 ); size_t index = aCadstarPadID - (long) 1;
if( !( index < aFootprint->Pads().size() ) )
{
THROW_IO_ERROR( _( "Unable to find pad index '%d' in footprint '%s'.", (long) aCadstarPadID,
aFootprint->GetReference() ) );
}
return aFootprint->Pads().at( index );
} }
@ -1703,12 +1711,11 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadComponents()
csPad.Side = padEx.Side; csPad.Side = padEx.Side;
// Find the pad in the footprint definition // Find the pad in the footprint definition
PAD* kiPad = getPadReference( footprint, padEx.ID ); PAD* kiPad = getPadReference( footprint, padEx.ID );
wxString padNumber = kiPad->GetNumber(); wxString padNumber = kiPad->GetNumber();
if( kiPad ) delete kiPad;
delete kiPad;
kiPad = getKiCadPad( csPad, footprint ); kiPad = getKiCadPad( csPad, footprint );
kiPad->SetNumber( padNumber ); kiPad->SetNumber( padNumber );