[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - hwpfilter/source

[Caolán McNamara (via logerrit)]

 hwpfilter/source/hwpfile.cxx |    2 ++
 hwpfilter/source/hwpfile.h   |    4 ++++
 2 files changed, 6 insertions(+)

New commits:
commit f74e05d2a29f0656fee76a4d8508e7aff2806185
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Feb 22 16:09:53 2022 +0000
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Feb 23 11:43:21 2022 +0100

    keep paragraph's that failed to load until import is complete
    
    LIBREOFFICE-509JU93T
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130326
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 32e8d3e45698a3cc09f66460b460db1d10ac50b5)
    
    Change-Id: I526edb182fed4fa023cce58e78a650a7c2046ed3

diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 552233dd853d..439e54d2465a 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -251,6 +251,7 @@ void HWPFile::ReadParaList(std::vector < HWPPara* > &aplist)
         aplist.push_back(spNode.release());
         spNode.reset( new HWPPara );
     }
+    pfailedlist.push_back(std::move(spNode));
 }
 
 bool HWPFile::ReadParaList(std::vector< std::unique_ptr<HWPPara> > &aplist, 
unsigned char flag)
@@ -284,6 +285,7 @@ bool HWPFile::ReadParaList(std::vector< 
std::unique_ptr<HWPPara> > &aplist, unsi
         aplist.push_back(std::move(spNode));
         spNode.reset( new HWPPara );
     }
+    pfailedlist.push_back(std::move(spNode));
 
     return true;
 }
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index 442b442e0514..3fe580ece7e6 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -285,6 +285,10 @@ class DLLEXPORT HWPFile
         std::vector<std::unique_ptr<ColumnInfo>> columnlist;
         // paragraph list
         std::vector<std::unique_ptr<HWPPara>> plist;
+        // keep paragraph's that failed to load until
+        // import is complete to avoid dangling references
+        // elsewhere
+        std::vector<std::unique_ptr<HWPPara>> pfailedlist;
         // floating box list
         std::vector<FBox*> blist;
         // embedded picture list(tag datas)