diff options
| author |   Sergey Torokhov <torokhov-s-a@yandex.ru> | 2024-03-09 21:46:09 +0300 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-03-09 20:53:24 +0000 |
| commit | 1942cc9d811e65d8488108b1ef0948058c53f213 (patch) | |
| tree | 0f078a256de8508019944c3e86a905f94a814c83 /dev-util/codeblocks/files | |
| parent | dev-python/ensurepip-setuptools: Stabilize 69.1.1 sparc, #926594 (diff) | |
| download | gentoo-1942cc9d811e65d8488108b1ef0948058c53f213.tar.gz gentoo-1942cc9d811e65d8488108b1ef0948058c53f213.tar.bz2 gentoo-1942cc9d811e65d8488108b1ef0948058c53f213.zip | |
dev-util/codeblocks: 20.03-r7, fix DoxyBlocks plugin startup segfault
Closes: https://bugs.gentoo.org/925955
Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/codeblocks/files')
| -rw-r--r-- | dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch b/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch new file mode 100644 index 000000000000..d641dcb75f83 --- /dev/null +++ b/dev-util/codeblocks/files/codeblocks-20.03_fix_DoxyBlocks_startup_segfault.patch @@ -0,0 +1,61 @@ +Upstream patch: https://sourceforge.net/p/codeblocks/code/12074/ +Upstream issue: https://sourceforge.net/p/codeblocks/tickets/839/ +Gentoo issue: https://bugs.gentoo.org/925955 + +--- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp ++++ b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp +@@ -101,8 +101,8 @@ + + // constructor + DoxyBlocks::DoxyBlocks() : +- m_pToolbar(0l), +- m_DoxyBlocksLog(0l), ++ m_pToolbar(nullptr), ++ m_DoxyBlocksLog(nullptr), + m_LogPageIndex(0), + m_bAutoVersioning(false) + { +@@ -234,8 +234,10 @@ + */ + void DoxyBlocks::OnUpdateUI(wxUpdateUIEvent& WXUNUSED(event)) + { +- if(Manager::Get()->GetProjectManager()->GetProjects()->GetCount() == 0){ +- m_pToolbar->Enable(false); ++ if (Manager::Get()->GetProjectManager()->GetProjects()->GetCount() == 0) ++ { ++ if (m_pToolbar) ++ m_pToolbar->Enable(false); + wxMenuBar *menuBar = Manager::Get()->GetAppFrame()->GetMenuBar(); + menuBar->FindItem(ID_MENU_DOXYWIZARD)->Enable(false); + menuBar->FindItem(ID_MENU_EXTRACTPROJECT)->Enable(false); +@@ -264,14 +266,15 @@ + Manager::Get()->ProcessEvent(evt); + } + } +- m_DoxyBlocksLog = 0; +-} +- +-cbConfigurationPanel *DoxyBlocks::GetConfigurationPanel(wxWindow *parent) ++ m_DoxyBlocksLog = nullptr; ++} ++ ++cbConfigurationPanel* DoxyBlocks::GetConfigurationPanel(wxWindow *parent) + { + //create and display the configuration dialog for your plugin +- if(!IsAttached()){ +- return 0; ++ if (!IsAttached()) ++ { ++ return nullptr; + } + + // Get the version string before instantiating the panel so that it is recorded before +@@ -346,7 +349,7 @@ + + cbConfigurationPanel* DoxyBlocks::GetProjectConfigurationPanel(wxWindow* /*parent*/, cbProject* /*project*/) + { +- return 0; ++ return nullptr; + } + + void DoxyBlocks::OnConfigure(wxCommandEvent & WXUNUSED(event)) |