[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

[Ivan Timofeev]

 svx/source/svdraw/svdotext.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3d1576aa02dd638c252e5993e52c7de7833f9e10
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Thu Aug 8 18:44:57 2013 +0400

    fdo#67871: Revert "coverity#705731 Resource leak"
    
    ... and delete pContourPolyPolygon instead. Otherwise there is a null pointer
    dereference.
    
    This reverts commit e3258713793f03d6cf96c19ff4c5d15a0cd666f1.
    
    Change-Id: Id9d8c514c786b42233a35a9ade55d0c05986fb08
    (cherry picked from commit 2a0dd33a384009dcc92238cec344c9b0e98cf25f)
    Reviewed-on: https://gerrit.libreoffice.org/5315
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 387a561..4c331c6 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -601,6 +601,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
     {
         // Take line width into account.
         // When doing the hit test, avoid this. (Performance!)
+        pContourPolyPolygon = new basegfx::B2DPolyPolygon();
 
         // test if shadow needs to be avoided for TakeContour()
         const SfxItemSet& rSet = GetObjectItemSet();
@@ -636,6 +637,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
     }
 
     rOutliner.SetPolygon(aXorPolyPolygon, pContourPolyPolygon);
+    delete pContourPolyPolygon;
 }
 
 void SdrTextObj::TakeUnrotatedSnapRect(Rectangle& rRect) const