[Libreoffice-commits] core.git: vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/app/svmain.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 556243467a0ac3f647de75bf3fb6c9f3b72466a4
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jun 2 13:06:54 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jun 2 20:30:59 2021 +0200

    fix shutdown leak in CppunitTest_sw_filters_test
    
    of GenericUnixSalData
    
    Change-Id: I4201d617fa4618fc0be58dcf4d1279e0b60e2dcf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116582
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index d5a305103faa..fec1748d1c05 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -52,6 +52,7 @@
 #include <debugevent.hxx>
 #include <scrwnd.hxx>
 #include <windowdev.hxx>
+#include <saldatabasic.hxx>
 
 #ifdef _WIN32
 #include <svsys.h>
@@ -595,6 +596,12 @@ void DeInitVCL()
         pSVData->mpDefInst = nullptr;
     }
 
+    // This only works on Linux. On Mac and Windows I get very
+    // weird segment violations.
+#if defined LINUX
+    delete pSVData->mpSalData;
+#endif
+
     if( pOwnSvApp )
     {
         delete pOwnSvApp;