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

pns: fixed a few memleaks & conditional jumps depending on uninitalized variables

This commit is contained in:
Maciej Suminski 2016-08-17 15:09:48 +02:00
parent 7909de6127
commit 9f0b42cb35
4 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/geometry/shape_collisions.cpp
View File

@ -466,6 +466,7 @@ bool SHAPE::Collide( const SHAPE* aShape, int aClerance ) const
return CollideShapes( this, aShape, aClerance, false, dummy ); return CollideShapes( this, aShape, aClerance, false, dummy );
} }
bool SHAPE_RECT::Collide( const SEG& aSeg, int aClearance ) const bool SHAPE_RECT::Collide( const SEG& aSeg, int aClearance ) const
{ {
//VECTOR2I pmin = VECTOR2I( std::min( aSeg.a.x, aSeg.b.x ), std::min( aSeg.a.y, aSeg.b.y ) ); //VECTOR2I pmin = VECTOR2I( std::min( aSeg.a.x, aSeg.b.x ), std::min( aSeg.a.y, aSeg.b.y ) );

14
pcbnew/router/pns_kicad_iface.cpp
View File

@ -295,6 +295,7 @@ public:
~PNS_PCBNEW_DEBUG_DECORATOR() ~PNS_PCBNEW_DEBUG_DECORATOR()
{ {
Clear(); Clear();
delete m_items;
} }
void SetView( KIGFX::VIEW* aView ) void SetView( KIGFX::VIEW* aView )
@ -416,11 +417,14 @@ PNS_KICAD_IFACE::PNS_KICAD_IFACE()
PNS_KICAD_IFACE::~PNS_KICAD_IFACE() PNS_KICAD_IFACE::~PNS_KICAD_IFACE()
{ {
if( m_ruleResolver )
delete m_ruleResolver; delete m_ruleResolver;
if( m_debugDecorator )
delete m_debugDecorator; delete m_debugDecorator;
if( m_previewItems )
{
m_previewItems->FreeItems();
delete m_previewItems;
}
} }
@ -741,9 +745,7 @@ void PNS_KICAD_IFACE::SyncWorld( PNS_NODE *aWorld )
int worstClearance = m_board->GetDesignSettings().GetBiggestClearanceValue(); int worstClearance = m_board->GetDesignSettings().GetBiggestClearanceValue();
if( m_ruleResolver )
delete m_ruleResolver; delete m_ruleResolver;
m_ruleResolver = new PNS_PCBNEW_RULE_RESOLVER( m_board, m_router ); m_ruleResolver = new PNS_PCBNEW_RULE_RESOLVER( m_board, m_router );
aWorld->SetRuleResolver( m_ruleResolver ); aWorld->SetRuleResolver( m_ruleResolver );
@ -892,9 +894,7 @@ void PNS_KICAD_IFACE::SetView( KIGFX::VIEW *aView )
m_view->Add( m_previewItems ); m_view->Add( m_previewItems );
m_previewItems->ViewSetVisible( true ); m_previewItems->ViewSetVisible( true );
if( m_debugDecorator )
delete m_debugDecorator; delete m_debugDecorator;
m_debugDecorator = new PNS_PCBNEW_DEBUG_DECORATOR(); m_debugDecorator = new PNS_PCBNEW_DEBUG_DECORATOR();
m_debugDecorator->SetView( m_view ); m_debugDecorator->SetView( m_view );
} }

1
pcbnew/router/pns_node.cpp
View File

@ -205,6 +205,7 @@ struct PNS_NODE::DEFAULT_OBSTACLE_VISITOR : public PNS_OBSTACLE_VISITOR
m_kindMask( aKindMask ), m_kindMask( aKindMask ),
m_limitCount( -1 ), m_limitCount( -1 ),
m_matchCount( 0 ), m_matchCount( 0 ),
m_extraClearance( 0 ),
m_differentNetsOnly( aDifferentNetsOnly ), m_differentNetsOnly( aDifferentNetsOnly ),
m_forceClearance( -1 ) m_forceClearance( -1 )
{ {

13
pcbnew/router/pns_tool_base.cpp
View File

@ -68,7 +68,10 @@ TOOL_ACTION PNS_TOOL_BASE::ACT_RouterOptions( "pcbnew.InteractiveRouter.RouterOp
PNS_TOOL_BASE::PNS_TOOL_BASE( const std::string& aToolName ) : PNS_TOOL_BASE::PNS_TOOL_BASE( const std::string& aToolName ) :
TOOL_INTERACTIVE( aToolName ) TOOL_INTERACTIVE( aToolName )
{ {
m_gridHelper = NULL;
m_iface = NULL;
m_router = NULL; m_router = NULL;
m_startItem = NULL; m_startItem = NULL;
m_startLayer = 0; m_startLayer = 0;
@ -83,20 +86,18 @@ PNS_TOOL_BASE::PNS_TOOL_BASE( const std::string& aToolName ) :
PNS_TOOL_BASE::~PNS_TOOL_BASE() PNS_TOOL_BASE::~PNS_TOOL_BASE()
{ {
delete m_router;
delete m_gridHelper; delete m_gridHelper;
delete m_iface;
delete m_router;
} }
void PNS_TOOL_BASE::Reset( RESET_REASON aReason ) void PNS_TOOL_BASE::Reset( RESET_REASON aReason )
{ {
if( m_router )
delete m_router;
if( m_gridHelper)
delete m_gridHelper; delete m_gridHelper;
delete m_iface;
delete m_router;
m_frame = getEditFrame<PCB_EDIT_FRAME>(); m_frame = getEditFrame<PCB_EDIT_FRAME>();
m_ctls = getViewControls(); m_ctls = getViewControls();