[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - formula/source

Julien Nabet serval2412 at yahoo.fr
Mon May 30 09:36:41 UTC 2016


 formula/source/core/api/token.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fdd5860624f5e1c1cfbaea3c72e65c00ce3e1e5c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun May 29 21:49:08 2016 +0200

    cid#1362174, 1362177: USE_AFTER_FREE+resource leak due to copypasta
    
    Change-Id: Icd903335fdef3921781e2f16e98a0e10bda31e3f
    Reviewed-on: https://gerrit.libreoffice.org/25641
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 7a2bca302f8299d70f77952110fb4ccfa4b258c2)
    Reviewed-on: https://gerrit.libreoffice.org/25649
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 14a671b..c0b52b6 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1520,7 +1520,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( const MissingConvention &
     }
 
     if (pOcds != &aOpCodeDcountStack[0])
-        delete [] pOcas;
+        delete [] pOcds;
     if (pOcas != &aOpCodeAddressStack[0])
         delete [] pOcas;
     if (pCtx != &aCtx[0])


More information about the Libreoffice-commits mailing list