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

Markus Mohrhard markus.mohrhard at googlemail.com
Mon Mar 14 17:48:22 UTC 2016


 vcl/headless/svpinst.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c62afab9d4138583eb22afe46608b323f902f095
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Mar 14 18:01:15 2016 +0100

    fix memory leak in headless backend
    
    Change-Id: I90282c86b45845fc35b23b275301be24a2f18a4d
    Reviewed-on: https://gerrit.libreoffice.org/23248
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index ed3159a..0c71f63 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -142,8 +142,12 @@ void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
         std::list< SalUserEvent >::iterator it = m_aUserEvents.begin();
         do
         {
-            if( it->m_pFrame    == pFrame )
+            if( it->m_pFrame == pFrame )
             {
+                if (it->m_nEvent == SALEVENT_USEREVENT)
+                {
+                    delete static_cast<ImplSVEvent *>(it->m_pData);
+                }
                 it = m_aUserEvents.erase( it );
             }
             else


More information about the Libreoffice-commits mailing list