sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx | 9 ++++++---
vcl/unx/gtk3/a11y/atkwrapper.cxx | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 19e588c6dae2ab1720d51aa934e2f5dcfe49dd1c
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Aug 22 14:04:57 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Aug 24 16:43:20 2024 +0200
cid#1607908 silence Overflowed return value
Change-Id: Iafc85f656b0703cd6a4e19469f4752203789477e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172347
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx
index b83cf04d48b5..bd417f4d60d4 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx
@@ -544,7 +544,8 @@ wrapper_get_index_in_parent( AtkObject *atk_obj )
{
try {
sal_Int64 nIndex = obj->mpContext->getAccessibleIndexInParent();
- if (nIndex > std::numeric_limits<gint>::max())
+ if (nIndex > std::numeric_limits<gint>::max() ||
+ nIndex < std::numeric_limits<gint>::min())
{
// use -2 when the child index is too large to fit into 32 bit
to neither use the
// valid index of another child nor -1, which would e.g. make
Orca interpret the
commit cb115be987c4aa3dc2daed02dcd1b419e8d6a61e
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Aug 24 10:40:34 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Aug 24 16:43:06 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>
diff --git a/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx
b/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx
index 72e37c4da860..f8d3a762871a 100644
--- a/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx
+++ b/sw/source/writerfilter/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:
