diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-10-24 15:29:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-10-25 09:55:18 +0200 |
| commit | 56616073d2044520cd4eb21e9e4a6bc363d03ee0 (patch) | |
| tree | 6edb7a7ca7f2d714112dd202859e3d4124bc388c /sc/source/ui/docshell/impex.cxx | |
| parent | 035f5f1d98ca7468193998bbb7c890dce32ea17c (diff) | |
ofz#3768 Integer-overflow
Change-Id: I37067d29bb18b3afe01397f161d7b135de91146a
Reviewed-on: https://gerrit.libreoffice.org/43780
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/docshell/impex.cxx')
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 80069b4eef59..6aa1e4c1dfa2 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -53,6 +53,7 @@ #include <documentimport.hxx> #include <globstr.hrc> +#include <o3tl/safeint.hxx> #include <vcl/svapp.hxx> #include <memory> @@ -1752,37 +1753,45 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) switch( ch ) { case 'X': - nCol = static_cast<SCCOL>(OUString(p).toInt32()) + nStartCol - 1; - if (nCol < 0 || MAXCOL < nCol) + { + bool bFail = o3tl::checked_add<SCCOL>(OUString(p).toInt32(), nStartCol - 1, nCol); + if (bFail || nCol < 0 || MAXCOL < nCol) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;X invalid nCol=" << nCol); - nCol = std::max<SCCOL>( 0, std::min<SCCOL>( nCol, MAXCOL)); + nCol = std::max<SCCOL>(0, std::min<SCCOL>(nCol, MAXCOL)); } break; + } case 'Y': - nRow = OUString(p).toInt32() + nStartRow - 1; - if (nRow < 0 || MAXROW < nRow) + { + bool bFail = o3tl::checked_add(OUString(p).toInt32(), nStartRow - 1, nRow); + if (bFail || nRow < 0 || MAXROW < nRow) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;Y invalid nRow=" << nRow); - nRow = std::max<SCROW>( 0, std::min<SCROW>( nRow, MAXROW)); + nRow = std::max<SCROW>(0, std::min<SCROW>(nRow, MAXROW)); } break; + } case 'C': - nRefCol = static_cast<SCCOL>(OUString(p).toInt32()) + nStartCol - 1; - if (nRefCol < 0 || MAXCOL < nRefCol) + { + bool bFail = o3tl::checked_add<SCCOL>(OUString(p).toInt32(), nStartCol - 1, nRefCol); + if (bFail || nRefCol < 0 || MAXCOL < nRefCol) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;C invalid nRefCol=" << nRefCol); - nRefCol = std::max<SCCOL>( 0, std::min<SCCOL>( nRefCol, MAXCOL)); + nRefCol = std::max<SCCOL>(0, std::min<SCCOL>(nRefCol, MAXCOL)); } break; + } case 'R': - nRefRow = OUString(p).toInt32() + nStartRow - 1; - if (nRefRow < 0 || MAXROW < nRefRow) + { + bool bFail = o3tl::checked_add(OUString(p).toInt32(), nStartRow - 1, nRefRow); + if (bFail || nRefRow < 0 || MAXROW < nRefRow) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;R invalid nRefRow=" << nRefRow); - nRefRow = std::max<SCROW>( 0, std::min<SCROW>( nRefRow, MAXROW)); + nRefRow = std::max<SCROW>(0, std::min<SCROW>(nRefRow, MAXROW)); } break; + } case 'K': { if( !bSingle && @@ -1892,21 +1901,25 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) switch( ch ) { case 'X': - nCol = static_cast<SCCOL>(OUString(p).toInt32()) + nStartCol - 1; - if (nCol < 0 || MAXCOL < nCol) + { + bool bFail = o3tl::checked_add<SCCOL>(OUString(p).toInt32(), nStartCol - 1, nCol); + if (bFail || nCol < 0 || MAXCOL < nCol) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;X invalid nCol=" << nCol); - nCol = std::max<SCCOL>( 0, std::min<SCCOL>( nCol, MAXCOL)); + nCol = std::max<SCCOL>(0, std::min<SCCOL>(nCol, MAXCOL)); } break; + } case 'Y': - nRow = OUString(p).toInt32() + nStartRow - 1; - if (nRow < 0 || MAXROW < nRow) + { + bool bFail = o3tl::checked_add(OUString(p).toInt32(), nStartRow - 1, nRow); + if (bFail || nRow < 0 || MAXROW < nRow) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;Y invalid nRow=" << nRow); - nRow = std::max<SCROW>( 0, std::min<SCROW>( nRow, MAXROW)); + nRow = std::max<SCROW>(0, std::min<SCROW>(nRow, MAXROW)); } break; + } case 'P' : if ( bData ) { |