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

SCH_LABEL_BASE::ResolveTextVar(): Protect against null pointer 

It can happen in QA tests.
This commit is contained in:
jean-pierre charras 2022-09-08 17:12:32 +02:00
parent 9bed145475
commit 2033d9a6c5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eeschema/sch_label.cpp
View File

@ -465,6 +465,9 @@ bool SCH_LABEL_BASE::ResolveTextVar( wxString* token, int aDepth ) const
{ {
if( token->Contains( ':' ) ) if( token->Contains( ':' ) )
{ {
if( !Schematic() )
return false;
if( Schematic()->ResolveCrossReference( token, aDepth ) ) if( Schematic()->ResolveCrossReference( token, aDepth ) )
return true; return true;
} }
@ -523,11 +526,14 @@ bool SCH_LABEL_BASE::ResolveTextVar( wxString* token, int aDepth ) const
if( sheet->ResolveTextVar( token, aDepth ) ) if( sheet->ResolveTextVar( token, aDepth ) )
return true; return true;
} }
else if( SCH_SHEET* sheet = Schematic()->CurrentSheet().Last() ) else if( Schematic() )
{
if( SCH_SHEET* sheet = Schematic()->CurrentSheet().Last() )
{ {
if( sheet->ResolveTextVar( token, aDepth ) ) if( sheet->ResolveTextVar( token, aDepth ) )
return true; return true;
} }
}
return false; return false;
} }
@ -882,7 +888,6 @@ void SCH_LABEL_BASE::Plot( PLOTTER* aPlotter, bool aBackground ) const
static std::vector<VECTOR2I> s_poly; static std::vector<VECTOR2I> s_poly;
RENDER_SETTINGS* settings = aPlotter->RenderSettings(); RENDER_SETTINGS* settings = aPlotter->RenderSettings();
SCHEMATIC* schematic = Schematic();
SCH_CONNECTION* connection = Connection(); SCH_CONNECTION* connection = Connection();
int layer = ( connection && connection->IsBus() ) ? LAYER_BUS : m_layer; int layer = ( connection && connection->IsBus() ) ? LAYER_BUS : m_layer;
COLOR4D color = settings->GetLayerColor( layer ); COLOR4D color = settings->GetLayerColor( layer );