From bba7fae104d6ab719af85c6244d9533a5301ac18 Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Wed, 24 Feb 2021 22:55:11 -0500 Subject: [PATCH] Coverity fixes --- pcbnew/board_stackup_manager/panel_board_stackup.cpp | 4 +++- pcbnew/dialogs/panel_setup_layers.cpp | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pcbnew/board_stackup_manager/panel_board_stackup.cpp b/pcbnew/board_stackup_manager/panel_board_stackup.cpp index 6617d11c26..10e8c81a68 100644 --- a/pcbnew/board_stackup_manager/panel_board_stackup.cpp +++ b/pcbnew/board_stackup_manager/panel_board_stackup.cpp @@ -116,7 +116,7 @@ PANEL_SETUP_BOARD_STACKUP::PANEL_SETUP_BOARD_STACKUP( PAGED_DIALOG* aParent, PCB synchronizeWithBoard( true ); m_choiceCopperLayers->Bind( wxEVT_CHOICE, - [&]( wxCommandEvent ) + [&]( wxCommandEvent& ) { updateCopperLayerCount(); showOnlyActiveLayers(); @@ -1217,6 +1217,8 @@ void PANEL_SETUP_BOARD_STACKUP::onMaterialChange( wxCommandEvent& event ) default: item_mat_list = nullptr; break; } + wxCHECK( item_mat_list, /* void */ ); + DIALOG_DIELECTRIC_MATERIAL dlg( this, *item_mat_list ); if( dlg.ShowModal() != wxID_OK ) diff --git a/pcbnew/dialogs/panel_setup_layers.cpp b/pcbnew/dialogs/panel_setup_layers.cpp index 9252916ecb..75a2ce3fd8 100644 --- a/pcbnew/dialogs/panel_setup_layers.cpp +++ b/pcbnew/dialogs/panel_setup_layers.cpp @@ -121,7 +121,9 @@ static LSEQ dlg_layers() PANEL_SETUP_LAYERS::PANEL_SETUP_LAYERS( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame ) : PANEL_SETUP_LAYERS_BASE( aParent->GetTreebook() ), - m_parentDialog( aParent ), m_frame( aFrame ) + m_parentDialog( aParent ), + m_frame( aFrame ), + m_physicalStackup( nullptr ) { m_pcb = aFrame->GetBoard(); } @@ -443,6 +445,8 @@ bool PANEL_SETUP_LAYERS::TransferDataFromWindow() if( !testLayerNames() ) return false; + wxASSERT( m_physicalStackup ); + // Make sure we have the latest copper layer count SyncCopperLayers( m_physicalStackup->GetCopperLayerCount() );