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

Fix possible null-dereference.

This commit is contained in:
Jeff Young 2020-04-17 21:11:12 +01:00
parent 6af21703fe
commit 7526d2affb
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeschema/lib_pin.cpp
View File

@ -561,7 +561,11 @@ void LIB_PIN::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* a
const TRANSFORM& aTransform ) const TRANSFORM& aTransform )
{ {
PART_DRAW_OPTIONS* opts = (PART_DRAW_OPTIONS*) aData; PART_DRAW_OPTIONS* opts = (PART_DRAW_OPTIONS*) aData;
LIB_PART* part = GetParent(); bool drawHiddenFields = opts ? opts->draw_hidden_fields : false;
bool showPinType = opts ? opts->show_elec_type : false;
int textMarkupFlags = opts ? opts->text_markup_flags : 0;
LIB_PART* part = GetParent();
/* Calculate pin orient taking in account the component orientation. */ /* Calculate pin orient taking in account the component orientation. */
int orient = PinDrawOrient( aTransform ); int orient = PinDrawOrient( aTransform );
@ -569,14 +573,14 @@ void LIB_PIN::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* a
/* Calculate the pin position */ /* Calculate the pin position */
wxPoint pos1 = aTransform.TransformCoordinate( m_position ) + aOffset; wxPoint pos1 = aTransform.TransformCoordinate( m_position ) + aOffset;
if( IsVisible() || ( opts && opts->draw_hidden_fields ) ) if( IsVisible() || drawHiddenFields )
{ {
PrintPinSymbol( aSettings, pos1, orient ); PrintPinSymbol( aSettings, pos1, orient );
PrintPinTexts( aSettings, pos1, orient, part->GetPinNameOffset(), part->ShowPinNumbers(), PrintPinTexts( aSettings, pos1, orient, part->GetPinNameOffset(), part->ShowPinNumbers(),
part->ShowPinNames(), opts->text_markup_flags ); part->ShowPinNames(), textMarkupFlags );
if( opts && opts->show_elec_type ) if( showPinType )
PrintPinElectricalTypeName( aSettings, pos1, orient ); PrintPinElectricalTypeName( aSettings, pos1, orient );
} }
} }