wsd/DocumentBroker.cpp | 2 ++ wsd/DocumentBroker.hpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit 17044ade27ec94f135b95350a8a96ae7696049a2 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> AuthorDate: Wed Jun 3 12:30:40 2020 -0400 Commit: Ashod Nakashian <ashnak...@gmail.com> CommitDate: Tue Jun 23 06:42:53 2020 +0200 wsd: fix: call to virtual function during destruction Change-Id: I914025fe642f6c78d4a5731fdb8e8920a62838b1 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96379 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Ashod Nakashian <ashnak...@gmail.com> diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index f62241808..c242da586 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -2325,6 +2325,8 @@ void ConvertToBroker::dispose() ConvertToBroker::~ConvertToBroker() { + // Calling a virtual function from a dtor + // is only valid if there are no inheritors. dispose(); } diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp index 17300d0cb..42d506629 100644 --- a/wsd/DocumentBroker.hpp +++ b/wsd/DocumentBroker.hpp @@ -442,7 +442,7 @@ private: }; #if !MOBILEAPP -class ConvertToBroker : public DocumentBroker +class ConvertToBroker final : public DocumentBroker { const std::string _format; const std::string _sOptions; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits