From 0169227035c5bfb70da615824f5714762b4ba062 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 26 Feb 2018 12:30:57 +0000 Subject: forcepoint #10 pop empty stack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I96452a86187a6b03251614625445d1b18a5ee218 Reviewed-on: https://gerrit.libreoffice.org/50357 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- writerfilter/source/dmapper/DomainMapperTableManager.cxx | 6 ++++++ writerfilter/source/rtftok/rtfdispatchvalue.cxx | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 40ca3365232c..93b4d9266db4 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -453,6 +453,12 @@ void DomainMapperTableManager::startLevel( ) void DomainMapperTableManager::endLevel( ) { + if (m_aTableGrid.empty()) + { + SAL_WARN("writerfilter.dmapper", "Table stack is empty"); + return; + } + m_aTableGrid.pop_back( ); m_aGridSpans.pop_back( ); diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 2ea3c547b10e..efe8a1ef0c1f 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -213,7 +213,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) } if (nSprm > 0) { - LanguageTag aTag((LanguageType(nParam))); + LanguageTag aTag((LanguageType(static_cast(nParam)))); auto pValue = std::make_shared(aTag.getBcp47()); putNestedAttribute(m_aStates.top().aCharacterSprms, NS_ooxml::LN_EG_RPrBase_lang, nSprm, pValue); -- cgit