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

Eagle plugin: check before dereferencing optional attributes

This commit is contained in:
Maciej Suminski 2017-06-19 14:44:31 +02:00
parent 7ea33f76b4
commit 7d2320b5ad
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
eeschema/sch_eagle_plugin.cpp
View File

@ -552,8 +552,8 @@ SCH_GLOBALLABEL* SCH_EAGLE_PLUGIN::loadLabel(wxXmlNode* aLabelNode, wxString aNe
glabel->SetText(elabel.netname); glabel->SetText(elabel.netname);
glabel->SetTextSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) ); glabel->SetTextSize( wxSize( GetDefaultTextSize(), GetDefaultTextSize() ) );
EROT rot = elabel.rot.Get(); if( elabel.rot )
glabel->SetLabelSpinStyle( int(rot.degrees/90+2)%4 ); glabel->SetLabelSpinStyle( int( elabel.rot.Get().degrees/90+2)%4 );
return glabel.release(); return glabel.release();
} }
@ -783,23 +783,26 @@ LIB_PIN* SCH_EAGLE_PLUGIN::loadPin( LIB_PART* aPart, wxXmlNode* aPin )
break; break;
} }
wxString length = epin.length.Get(); if( epin.length )
{
wxString length = epin.length.Get();
if( length =="short" ) if( length =="short" )
{ {
pin->SetLength( 100 ); pin->SetLength( 100 );
} }
else if( length =="middle" ) else if( length =="middle" )
{ {
pin->SetLength( 200 ); pin->SetLength( 200 );
} }
else if( length == "long" ) else if( length == "long" )
{ {
pin->SetLength( 300 ); pin->SetLength( 300 );
} }
else if( length == "point" ) else if( length == "point" )
{ {
pin->SetLength( 0 ); pin->SetLength( 0 );
}
} }
return pin.release(); return pin.release();