realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

A couple more memory leaks.

Browse Source
This commit is contained in:
Jeff Young 2025-05-25 11:32:51 +01:00
parent 134e3140ff
commit 1e45ca3e65
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eeschema/sch_design_block_utils.cpp
View File

@ -44,7 +44,8 @@
bool checkOverwriteDb( wxWindow* aFrame, wxString& libname, wxString& newName ) bool checkOverwriteDb( wxWindow* aFrame, wxString& libname, wxString& newName )
{ {
wxString msg = wxString::Format( _( "Design block '%s' already exists in library '%s'." ), newName.GetData(), wxString msg = wxString::Format( _( "Design block '%s' already exists in library '%s'." ),
newName.GetData(),
libname.GetData() ); libname.GetData() );
if( OKOrCancelDialog( aFrame, _( "Confirmation" ), msg, _( "Overwrite existing design block?" ), _( "Overwrite" ) ) if( OKOrCancelDialog( aFrame, _( "Confirmation" ), msg, _( "Overwrite existing design block?" ), _( "Overwrite" ) )
@ -59,8 +60,8 @@ bool checkOverwriteDb( wxWindow* aFrame, wxString& libname, wxString& newName )
bool checkOverwriteDbSchematic( wxWindow* aFrame, const LIB_ID& aLibId ) bool checkOverwriteDbSchematic( wxWindow* aFrame, const LIB_ID& aLibId )
{ {
wxString msg = wxString msg = wxString::Format( _( "Design block '%s' already has a schematic." ),
wxString::Format( _( "Design block '%s' already has a schematic." ), aLibId.GetUniStringLibItemName() ); aLibId.GetUniStringLibItemName() );
if( OKOrCancelDialog( aFrame, _( "Confirmation" ), msg, _( "Overwrite existing schematic?" ), _( "Overwrite" ) ) if( OKOrCancelDialog( aFrame, _( "Confirmation" ), msg, _( "Overwrite existing schematic?" ), _( "Overwrite" ) )
!= wxID_OK ) != wxID_OK )
@ -119,9 +120,7 @@ bool SCH_EDIT_FRAME::SaveSheetAsDesignBlock( const wxString& aLibraryName, SCH_S
wxString newName = blk.GetLibId().GetLibItemName(); wxString newName = blk.GetLibId().GetLibItemName();
if( Prj().DesignBlockLibs()->DesignBlockExists( libName, newName ) && !checkOverwriteDb( this, libName, newName ) ) if( Prj().DesignBlockLibs()->DesignBlockExists( libName, newName ) && !checkOverwriteDb( this, libName, newName ) )
{
return false; return false;
}
// Save a temporary copy of the schematic file, as the plugin is just going to move it // Save a temporary copy of the schematic file, as the plugin is just going to move it
wxString tempFile = wxFileName::CreateTempFileName( "design_block" ); wxString tempFile = wxFileName::CreateTempFileName( "design_block" );
@ -174,11 +173,11 @@ bool SCH_EDIT_FRAME::SaveSheetToDesignBlock( const LIB_ID& aLibId, SCH_SHEET_PAT
return false; return false;
} }
DESIGN_BLOCK* blk = nullptr; std::unique_ptr<DESIGN_BLOCK> blk;
try try
{ {
blk = Prj().DesignBlockLibs()->DesignBlockLoad( aLibId.GetLibNickname(), aLibId.GetLibItemName() ); blk.reset( Prj().DesignBlockLibs()->DesignBlockLoad( aLibId.GetLibNickname(), aLibId.GetLibItemName() ) );
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
{ {
@ -187,9 +186,7 @@ bool SCH_EDIT_FRAME::SaveSheetToDesignBlock( const LIB_ID& aLibId, SCH_SHEET_PAT
} }
if( !blk->GetSchematicFile().IsEmpty() && !checkOverwriteDbSchematic( this, aLibId ) ) if( !blk->GetSchematicFile().IsEmpty() && !checkOverwriteDbSchematic( this, aLibId ) )
{
return false; return false;
}
// Copy all fields from the sheet to the design block. // Copy all fields from the sheet to the design block.
// Note: this will overwrite any existing fields in the design block, but // Note: this will overwrite any existing fields in the design block, but
@ -207,7 +204,7 @@ bool SCH_EDIT_FRAME::SaveSheetToDesignBlock( const LIB_ID& aLibId, SCH_SHEET_PAT
blk->SetFields( dbFields ); blk->SetFields( dbFields );
DIALOG_DESIGN_BLOCK_PROPERTIES dlg( this, blk, true ); DIALOG_DESIGN_BLOCK_PROPERTIES dlg( this, blk.get(), true );
if( dlg.ShowModal() != wxID_OK ) if( dlg.ShowModal() != wxID_OK )
return false; return false;
@ -227,7 +224,7 @@ bool SCH_EDIT_FRAME::SaveSheetToDesignBlock( const LIB_ID& aLibId, SCH_SHEET_PAT
try try
{ {
success = Prj().DesignBlockLibs()->DesignBlockSave( aLibId.GetLibNickname(), blk ) success = Prj().DesignBlockLibs()->DesignBlockSave( aLibId.GetLibNickname(), blk.get() )
== DESIGN_BLOCK_LIB_TABLE::SAVE_OK; == DESIGN_BLOCK_LIB_TABLE::SAVE_OK;
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
@ -275,7 +272,9 @@ bool SCH_EDIT_FRAME::SaveSelectionAsDesignBlock( const wxString& aLibraryName )
SaveSheetAsDesignBlock( aLibraryName, curPath ); SaveSheetAsDesignBlock( aLibraryName, curPath );
} }
else else
{
DisplayErrorMessage( this, _( "Design blocks with nested sheets are not supported." ) ); DisplayErrorMessage( this, _( "Design blocks with nested sheets are not supported." ) );
}
return false; return false;
} }
@ -294,9 +293,7 @@ bool SCH_EDIT_FRAME::SaveSelectionAsDesignBlock( const wxString& aLibraryName )
wxString newName = blk.GetLibId().GetLibItemName(); wxString newName = blk.GetLibId().GetLibItemName();
if( Prj().DesignBlockLibs()->DesignBlockExists( libName, newName ) && !checkOverwriteDb( this, libName, newName ) ) if( Prj().DesignBlockLibs()->DesignBlockExists( libName, newName ) && !checkOverwriteDb( this, libName, newName ) )
{
return false; return false;
}
// Create a temporary screen // Create a temporary screen
SCH_SCREEN* tempScreen = new SCH_SCREEN( m_schematic ); SCH_SCREEN* tempScreen = new SCH_SCREEN( m_schematic );
@ -376,7 +373,9 @@ bool SCH_EDIT_FRAME::SaveSelectionToDesignBlock( const LIB_ID& aLibId )
SaveSheetToDesignBlock( aLibId, curPath ); SaveSheetToDesignBlock( aLibId, curPath );
} }
else else
{
DisplayErrorMessage( this, _( "Design blocks with nested sheets are not supported." ) ); DisplayErrorMessage( this, _( "Design blocks with nested sheets are not supported." ) );
}
return false; return false;
} }

4
pcbnew/pcb_design_block_utils.cpp
View File

@ -410,11 +410,11 @@ bool PCB_EDIT_FRAME::SaveSelectionToDesignBlock( const LIB_ID& aLibId )
} }
} }
DESIGN_BLOCK* blk = nullptr; std::unique_ptr<DESIGN_BLOCK> blk;
try try
{ {
blk = Prj().DesignBlockLibs()->DesignBlockLoad( aLibId.GetLibNickname(), aLibId.GetLibItemName() ); blk.reset( Prj().DesignBlockLibs()->DesignBlockLoad( aLibId.GetLibNickname(), aLibId.GetLibItemName() ) );
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
{ {