summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmlcss1.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-23 11:45:14 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-23 11:45:43 +0000
commitae5410086e6cbe30b8a650b10b4d2250e5e017ec (patch)
treefc8405a2f0160d13681074d3d2a4c56a0ec0215a /sw/source/filter/html/htmlcss1.cxx
parenta19b47b5d3e8f20adad614622dd93543a2dc667a (diff)
valgrind invalid read after delete in rhbz499052-1.html
Change-Id: Iecada2f8b6d977cc3f76814e4b2f38895873c362
Diffstat (limited to 'sw/source/filter/html/htmlcss1.cxx')
-rw-r--r--sw/source/filter/html/htmlcss1.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 2f8e386e020e..12544015625f 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -2298,7 +2298,9 @@ void SwHTMLParser::InsertParaAttrs( const SfxItemSet& rItemSet )
if( RES_PARATR_BEGIN > nWhich )
(*ppAttr)->SetLikePara();
aParaAttrs.push_back( *ppAttr );
- EndAttr( *ppAttr, 0, false );
+ bool bSuccess = EndAttr( *ppAttr, 0, false );
+ if (!bSuccess)
+ aParaAttrs.pop_back();
}
pItem = aIter.NextItem();