From 47a79b9cd94dcb919d1306dbe23323e2be0952b0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 17 Jun 2017 15:14:02 -0400 Subject: [PATCH] Coverity: fix some uninitialized members --- src/libcalamaresui/Branding.cpp | 10 +++++++++- src/modules/netinstall/NetInstallPage.cpp | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 8814b1b7e..b86172f0a 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -79,6 +79,7 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent ) : QObject( parent ) , m_descriptorPath( brandingFilePath ) + , m_componentName() { cDebug() << "Using Calamares branding file at" << brandingFilePath; QFile file( brandingFilePath ); @@ -188,7 +189,14 @@ Branding::Branding( const QString& brandingFilePath, } s_instance = this; - cDebug() << "Loaded branding component" << m_componentName; + if ( m_componentName.isEmpty() ) + { + cDebug() << "WARNING: failed to load component from" << brandingFilePath; + } + else + { + cDebug() << "Loaded branding component" << m_componentName; + } } diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp index 956b49fc9..94ba641ae 100644 --- a/src/modules/netinstall/NetInstallPage.cpp +++ b/src/modules/netinstall/NetInstallPage.cpp @@ -50,6 +50,7 @@ NetInstallPage::NetInstallPage( QWidget* parent ) : QWidget( parent ) , ui( new Ui::Page_NetInst ) , m_networkManager( this ) + , m_groups( nullptr ) { ui->setupUi( this ); }