[PATCH] Replace SV_DECL_PTRARR_DEL by ptr_vector in ww8par2.cxx

Arnaud Versini arnaud.versini at gmail.com
Sun Mar 18 03:02:08 PDT 2012


Hi,

This patch replace SV_DECL_PTRARR_DEL by a simple ptr_vector in
sw/source/filter/ww8/ww8par2.cxx. I will continue on the same way in this
folder if there is no issue with this patch.

I noticed with the RTF spec (doc file) a memory error (not due to this
patch) :

==5526== Invalid read of size 1
==5526==    at 0x24F492F4: SVBT16ToShort(unsigned char const*) (solar.h:88)
==5526==    by 0x24FF3547: SwWW8ImplReader::Read_UL(unsigned short,
unsigned char const*, short) (ww8par6.cxx:4180)
==5526==    by 0x24FF5EEB: SwWW8ImplReader::ImportSprm(unsigned char
const*, unsigned short) (ww8par6.cxx:6140)
==5526==    by 0x24FA6687: WW8RStyle::ImportSprms(unsigned char*, short,
bool) (ww8par2.cxx:3646)
==5526==    by 0x24FA6736: WW8RStyle::ImportSprms(unsigned long, short,
bool) (ww8par2.cxx:3663)
==5526==    by 0x24FA690A: WW8RStyle::ImportUPX(short, bool, bool)
(ww8par2.cxx:3720)
==5526==    by 0x24FA69FC: WW8RStyle::ImportGrupx(short, bool, bool)
(ww8par2.cxx:3742)
==5526==    by 0x24FA771A: WW8RStyle::Import1Style(unsigned short)
(ww8par2.cxx:3950)
==5526==    by 0x24FA93CF: WW8RStyle::ImportNewFormatStyles()
(ww8par2.cxx:4461)
==5526==    by 0x24FA9430: WW8RStyle::ImportStyles() (ww8par2.cxx:4469)
==5526==    by 0x24FA94CC: WW8RStyle::Import() (ww8par2.cxx:4481)
==5526==    by 0x24F77FF8: SwWW8ImplReader::CoreLoad(WW8Glossary*,
SwPosition const&) (ww8par.cxx:4474)
==5526==    by 0x24F7B48D: SwWW8ImplReader::LoadThroughDecryption(SwPaM&,
WW8Glossary*) (ww8par.cxx:5144)
==5526==    by 0x24F7C7CA: SwWW8ImplReader::LoadDoc(SwPaM&, WW8Glossary*)
(ww8par.cxx:5452)
==5526==    by 0x24F7CBF3: WW8Reader::Read(SwDoc&, String const&, SwPaM&,
String const&) (ww8par.cxx:5541)
==5526==    by 0x1EB8CD0A: SwReader::Read(Reader const&) (shellio.cxx:183)
==5526==    by 0x1ECCD05B: SwDocShell::ConvertFrom(SfxMedium&)
(docsh.cxx:256)
==5526==    by 0x6750747: SfxObjectShell::DoLoad(SfxMedium*)
(objstor.cxx:746)
==5526==    by 0x679BEB5:
SfxBaseModel::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>
const&) (sfxbasemodel.cxx:1904)
==5526==    by 0x67E83A8:
SfxFrameLoader_Impl::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>
const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame>
const&) (frmload.cxx:611)


Ps : this file need few hours on my computer to be opened with LibO +
Valgrind and have bad results, this is the only usable result I've got.

Best regards

-- 
Arnaud Versini
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120318/813b658c/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Use-ptr_vector-instead-of-SV_DECL_PTRARR_DEL-for-WW8MergeGroups.patch
Type: text/x-patch
Size: 7150 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120318/813b658c/attachment.bin>


More information about the LibreOffice mailing list