summaryrefslogtreecommitdiff
path: root/sc/source/filter/xml/xmlcoli.cxx
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-01-04 03:17:13 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-01-04 03:34:25 +0100
commit9bcfb6f06bf5a4708b8858469b4118af4222db5a (patch)
tree093291d5d72c9099c4fdbc5402b1ca481f7ad1e1 /sc/source/filter/xml/xmlcoli.cxx
parent3e85d9c62c69ee39dd4c6ae7cd556fdf53f5e01d (diff)
add some more safety checks for row and column import from ODS
Change-Id: Ic714c65cfe93198c462ba55752223f4e60e5aad9
Diffstat (limited to 'sc/source/filter/xml/xmlcoli.cxx')
-rw-r--r--sc/source/filter/xml/xmlcoli.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index 688300e27df3..ed892944e65a 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -66,7 +66,8 @@ ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport,
{
case XML_TOK_TABLE_COL_ATTR_REPEATED:
{
- nColCount = sValue.toInt32();
+ nColCount = std::max<sal_Int32>(sValue.toInt32(), 1);
+ nColCount = std::min<sal_Int32>(nColCount, MAXCOLCOUNT);
}
break;
case XML_TOK_TABLE_COL_ATTR_STYLE_NAME: