[Libreoffice-commits] core.git: sw/inc

[Stephan Bergmann]

 sw/inc/frmfmt.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 178e38dd82a2cffb2db747c7be82ba7a48338968
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 13 12:30:12 2016 +0100

    Don't leave WW8AnchorConvResult::m_bConverted uninitialized
    
    Presumably inadvertently dropped from d505b5d884fd42e063c709125e0e28e0a56045c4
    "add relative to tablecell as state".  Caused e.g. CppunitTest_sw_globalfilter
    to fail under ASan/UBSan with
    
    > sw/source/filter/ww8/wrtw8esh.cxx:2682:21: runtime error: load of value 152, which is not a valid value for type 'bool'
    >     #0 0x7f7494a13f8b in WinwordAnchoring::ConvertPosition(SwFormatHoriOrient&, SwFormatVertOrient&, SwFrameFormat const&) sw/source/filter/ww8/wrtw8esh.cxx:2682:21
    >     #1 0x7f7494a388e2 in WinwordAnchoring::SetAnchoring(SwFrameFormat const&) sw/source/filter/ww8/wrtw8esh.cxx:2703:32
    >     #2 0x7f7494a3ad15 in SwEscherEx::WriteFrameExtraData(SwFrameFormat const&) sw/source/filter/ww8/wrtw8esh.cxx:2830:23
    >     #3 0x7f7494a2b00b in SwBasicEscherEx::WriteGrfFlyFrame(SwFrameFormat const&, unsigned int) sw/source/filter/ww8/wrtw8esh.cxx:1737:5
    >     #4 0x7f7494a361d4 in SwEscherEx::WriteFlyFrame(DrawObj const&, unsigned int&, std::__debug::vector<DrawObj*, std::allocator<DrawObj*> >&) sw/source/filter/ww8/wrtw8esh.cxx:2854:28
    >     #5 0x7f7494a33a33 in SwEscherEx::SwEscherEx(SvStream*, WW8Export&) sw/source/filter/ww8/wrtw8esh.cxx:2346:36
    >     #6 0x7f7494a24b3b in WW8Export::CreateEscher() sw/source/filter/ww8/wrtw8esh.cxx:1510:25
    >     #7 0x7f7494c33c40 in WW8Export::StoreDoc1() sw/source/filter/ww8/wrtww8.cxx:2950:5
    >     #8 0x7f7494c3eb83 in WW8Export::ExportDocument_Impl() sw/source/filter/ww8/wrtww8.cxx:3304:5
    >     #9 0x7f7494c39335 in MSWordExportBase::ExportDocument(bool) sw/source/filter/ww8/wrtww8.cxx:3139:5
    >     #10 0x7f7494c45150 in SwWW8Writer::WriteStorage() sw/source/filter/ww8/wrtww8.cxx:3468:17
    >     #11 0x7f752cb38d3b in StgWriter::Write(SwPaM&, SotStorage&, rtl::OUString const*) sw/source/filter/writer/writer.cxx:512:22
    >     #12 0x7f752cb33863 in Writer::Write(SwPaM&, SvStream&, rtl::OUString const*) sw/source/filter/writer/writer.cxx:255:23
    >     #13 0x7f7494c45ad7 in SwWW8Writer::Write(SwPaM&, SfxMedium&, rtl::OUString const*) sw/source/filter/ww8/wrtww8.cxx:3485:33
    >     #14 0x7f752c80c3d0 in SwWriter::Write(tools::SvRef<Writer>&, rtl::OUString const*) sw/source/filter/basflt/shellio.cxx:867:28
    >     #15 0x7f752ccfcd6c in SwDocShell::ConvertTo(SfxMedium&) sw/source/uibase/app/docsh.cxx:756:27
    >     #16 0x7f75048bddd4 in SfxObjectShell::SaveTo_Impl(SfxMedium&, SfxItemSet const*) sfx2/source/doc/objstor.cxx:1542:19
    >     #17 0x7f75048d83c6 in SfxObjectShell::PreDoSaveAs_Impl(rtl::OUString const&, rtl::OUString const&, SfxItemSet&) sfx2/source/doc/objstor.cxx:2813:39
    >     #18 0x7f75048d5c07 in SfxObjectShell::CommonSaveAs_Impl(INetURLObject const&, rtl::OUString const&, SfxItemSet&) sfx2/source/doc/objstor.cxx:2683:9
    >     #19 0x7f7504897ea5 in SfxObjectShell::APISaveAs_Impl(rtl::OUString const&, SfxItemSet&) sfx2/source/doc/objserv.cxx:310:19
    >     #20 0x7f750498e0ce in SfxBaseModel::impl_store(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, bool) sfx2/source/doc/sfxbasemodel.cxx:3030:46
    >     #21 0x7f7504993862 in SfxBaseModel::storeToURL(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) sfx2/source/doc/sfxbasemodel.cxx:1666:13
    >     #22 0x7f753767c657 in Test::testLinkedGraphicRT() sw/qa/extras/globalfilter/globalfilter.cxx:170:20
    
    Change-Id: Ic1d7731b80a14751b3cc1dd0c009bfdb43b722c2

diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 029eea1..14a50be 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -288,7 +288,7 @@ namespace sw
         WW8AnchorConv m_eVertConv;
         bool m_bConverted;
         Point m_aPos;
-        WW8AnchorConvResult(WW8AnchorConv eHoriConv, WW8AnchorConv eVertConv) : m_eHoriConv(eHoriConv), m_eVertConv(eVertConv) {};
+        WW8AnchorConvResult(WW8AnchorConv eHoriConv, WW8AnchorConv eVertConv) : m_eHoriConv(eHoriConv), m_eVertConv(eVertConv), m_bConverted(false) {};
     };
     struct SW_DLLPUBLIC WW8AnchorConvHint final : SfxHint
     {