writerfilter/source/dmapper/DomainMapperTableManager.cxx | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 8789020d50794193a5f69b1ecd7c5a927c910b65
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Aug 24 10:40:34 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Aug 27 14:28:49 2024 +0200
cid#1616924 Dereference after null check
Change-Id: Ia326d99b11d18f7c561c988f0299feb2ebf84b6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172346
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit cb115be987c4aa3dc2daed02dcd1b419e8d6a61e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172281
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172461
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 2bbdfe86540e..20a8a6833e3f 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -240,9 +240,12 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
break;
case NS_ooxml::LN_CT_TblPrBase_tblStyle: //table style name
{
- TablePropertyMapPtr pPropMap( new TablePropertyMap );
- pPropMap->Insert( META_PROP_TABLE_STYLE_NAME, uno::Any(
pValue->getString() ));
- insertTableProps(pPropMap);
+ if (pValue)
+ {
+ TablePropertyMapPtr pPropMap( new TablePropertyMap );
+ pPropMap->Insert( META_PROP_TABLE_STYLE_NAME, uno::Any(
pValue->getString() ));
+ insertTableProps(pPropMap);
+ }
}
break;
case NS_ooxml::LN_CT_TblGridBase_gridCol:
