mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cid#1453991 Wrapper object use after free

Browse Source 
Change-Id: I4ea3ed40deaf20e91e1a0a42ee115cf761853875
Reviewed-on: https://gerrit.libreoffice.org/81170
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-10-20 15:55:23 +01:00
parent 7b96f6252b
commit 4dde0d06bd
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
View File

@@ -53,6 +53,7 @@
#include "finteraction.hxx"
#include <unotools/pathoptions.hxx>
#include <vcl/roadmapwizard.hxx>
#include <dbwizsetup.hxx>
#include "TextConnectionHelper.hxx"
#include <osl/diagnose.h>
@@ -219,12 +220,12 @@ using namespace ::com::sun::star;
OGenericAdministrationPage::callModifiedHdl();
}
std::unique_ptr<OMySQLIntroPageSetup> OMySQLIntroPageSetup::CreateMySQLIntroTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet)
std::unique_ptr<OMySQLIntroPageSetup> OMySQLIntroPageSetup::CreateMySQLIntroTabPage(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& rAttrSet)
{
return std::make_unique<OMySQLIntroPageSetup>(pPage, pController, rAttrSet);
}
OMySQLIntroPageSetup::OMySQLIntroPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs)
OMySQLIntroPageSetup::OMySQLIntroPageSetup(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& _rCoreAttrs)
: OGenericAdministrationPage(pPage, pController, "dbaccess/ui/dbwizmysqlintropage.ui", "DBWizMysqlIntroPage", _rCoreAttrs)
, m_xODBCDatabase(m_xBuilder->weld_radio_button("odbc"))
, m_xJDBCDatabase(m_xBuilder->weld_radio_button("jdbc"))
@@ -233,6 +234,7 @@ using namespace ::com::sun::star;
m_xODBCDatabase->connect_toggled(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected));
m_xJDBCDatabase->connect_toggled(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected));
m_xNATIVEDatabase->connect_toggled(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected));
pController->SetIntroPage(this);
}
OMySQLIntroPageSetup::~OMySQLIntroPageSetup()

6
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
View File

@@ -31,8 +31,8 @@
#include <ucbhelper/content.hxx>
namespace dbaui
{
class ODbTypeWizDialogSetup;
// OSpreadSheetConnectionPageSetup
class OSpreadSheetConnectionPageSetup final : public OConnectionTabPageSetup
@@ -197,10 +197,10 @@ namespace dbaui
VIA_NATIVE
};
OMySQLIntroPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
OMySQLIntroPageSetup(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& rCoreAttrs);
virtual ~OMySQLIntroPageSetup() override;
static std::unique_ptr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet);
static std::unique_ptr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& rAttrSet);
ConnectionType getMySQLMode() const;
void SetClickHdl( const Link<OMySQLIntroPageSetup *, void>& rLink ) { maClickHdl = rLink; }

8
dbaccess/source/ui/dlg/dbwizsetup.cxx
View File

@@ -446,6 +446,12 @@ void ODbTypeWizDialogSetup::clearPassword()
m_pImpl->clearPassword();
}
void ODbTypeWizDialogSetup::SetIntroPage(OMySQLIntroPageSetup* pPage)
{
m_pMySQLIntroPage = pPage;
m_pMySQLIntroPage->SetClickHdl(LINK( this, ODbTypeWizDialogSetup, ImplClickHdl ) );
}
std::unique_ptr<BuilderPage> ODbTypeWizDialogSetup::createPage(WizardState _nState)
{
std::unique_ptr<OGenericAdministrationPage> xPage;
@@ -515,8 +521,6 @@ std::unique_ptr<BuilderPage> ODbTypeWizDialogSetup::createPage(WizardState _nSta
break;
case PAGE_DBSETUPWIZARD_MYSQL_INTRO:
xPage = OMySQLIntroPageSetup::CreateMySQLIntroTabPage(pPageContainer, this, *m_pOutSet);
m_pMySQLIntroPage = static_cast<OMySQLIntroPageSetup*>(xPage.get());
m_pMySQLIntroPage->SetClickHdl(LINK( this, ODbTypeWizDialogSetup, ImplClickHdl ) );
break;
case PAGE_DBSETUPWIZARD_AUTHENTIFICATION:

2
dbaccess/source/ui/inc/dbwizsetup.hxx
View File

@@ -122,6 +122,8 @@ public:
*/
bool IsTableWizardToBeStarted() const;
void SetIntroPage(OMySQLIntroPageSetup* pPage);
private:
/// to override to create new pages
virtual std::unique_ptr<BuilderPage> createPage(WizardState _nState) override;