diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-06 16:35:52 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-06 16:43:03 +0200 |
commit | 1ab2ca73184a293e6bde95fef59695afb986748d (patch) | |
tree | fc7c2eeb039be7c58cacbd12c412e568b7524a1d /sw | |
parent | 01508a6172617659d74175d512bb29181a54a336 (diff) |
bnc#382137 DocxAttributeOutput: don't store address of local variable
AttributeOutputBase::TextField() passes the address of its local
variable to WriteExpand(), and DocxAttributeOutput::WriteField_Impl()
stored this. When it was to be used, the variable already went out of
scope, resulting in a crash. Given that SwField is an abstract base
class, the easiest way is to just copy the field and manually delete it
when it's no longer needed.
Change-Id: I9d1fe2485277f1ac21a576d7ff0d05003f0ac8a1
(cherry picked from commit 248a63f5d0d09b6e8388192a0fe7332a624e8829)
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 27bd60f684af..58d6b0a9bf56 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -489,6 +489,8 @@ void DocxAttributeOutput::EndRun() // Unknown fields sould be removed too if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) ) { + if (pIt->pField) + delete pIt->pField; pIt = m_Fields.erase( pIt ); continue; } @@ -523,6 +525,8 @@ void DocxAttributeOutput::EndRun() // Remove the field if no end needs to be written if ( !pIt->bClose ) { + if (pIt->pField) + delete pIt->pField; pIt = m_Fields.erase( pIt ); continue; } @@ -570,6 +574,8 @@ void DocxAttributeOutput::EndRun() while ( m_Fields.begin() != m_Fields.end() ) { EndField_Impl( m_Fields.front( ) ); + if (m_Fields.front().pField) + delete m_Fields.front().pField; m_Fields.erase( m_Fields.begin( ) ); } @@ -3712,7 +3718,8 @@ void DocxAttributeOutput::WriteExpand( const SwField* pFld ) void DocxAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField eType, const String& rFldCmd, sal_uInt8 nMode ) { struct FieldInfos infos; - infos.pField = pFld; + if (pFld) + infos.pField = pFld->CopyField(); infos.sCmd = rFldCmd; infos.eType = eType; infos.bClose = WRITEFIELD_CLOSE & nMode; |