[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/headless

[Markus Mohrhard]

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

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

    fix memory leak in headless backend
    
    Reviewed-on: https://gerrit.libreoffice.org/23248
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit c62afab9d4138583eb22afe46608b323f902f095)
    
    Change-Id: I90282c86b45845fc35b23b275301be24a2f18a4d
    Reviewed-on: https://gerrit.libreoffice.org/23261
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 0d765c1..12ef4e5 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -150,8 +150,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