ofz#58550 Direct-leak in writer layout

Change-Id: Id29138896a8da7a6badbeecfb0df24171c51f145
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index f754e13c63a4..1eae79dc4125 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -540,6 +540,15 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo &rInf )
                     SwKernPortion* pKrn =
                         new SwKernPortion( *rInf.GetLast(), nLstHeight,
                                            pLast->InFieldGrp() && pPor->InFieldGrp() );
+
+                    // ofz#58550 Direct-leak, pKrn adds itself as the NextPortion
+                    // of rInf.GetLast(), but may use CopyLinePortion to add a copy
+                    // of itself, which will then be left dangling with the following
+                    // SetNextPortion(nullptr)
+                    SwLinePortion *pNext = rInf.GetLast()->GetNextPortion();
+                    if (pNext != pKrn)
+                        delete pNext;
+
                     rInf.GetLast()->SetNextPortion( nullptr );
                     InsertPortion( rInf, pKrn );
                 }