[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

Caolán McNamara caolan at kemper.freedesktop.org
Sun Jul 15 00:37:46 PDT 2012


 sc/source/filter/html/htmlpars.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5a86dee80fed8470213186294169582b89cf497f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Jul 15 03:42:27 2012 +0200

    prevent double delete in calc's html parser, fdo#52107
    
    Change-Id: I0a203a39697d3b12304e4b9dc99714cd7b2a008c
    (cherry picked from commit 0d21d9ddbe0561f45419ae4fc376c312565b413b)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 323e1a2..d9363e4 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -554,6 +554,7 @@ void ScHTMLLayoutParser::Adjust()
                 nCurRow = pS->nCurRow;
             }
             delete pS;
+            pS = NULL;
             nTab = pE->nTab;
             pTab = (pTables ? (Table*) pTables->Get( nTab ) : NULL);
 


More information about the Libreoffice-commits mailing list