diff options
| author | Eike Rathke <erack@redhat.com> | 2017-09-14 14:30:08 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-14 17:46:51 +0200 |
| commit | 29d72cac593d130e291aabb58685c0f6b7ffc59a (patch) | |
| tree | 451429ae087e68f1f171c78ada1c397f7cf9a4d8 | |
| parent | Updated core (diff) | |
| download | core-29d72cac593d130e291aabb58685c0f6b7ffc59a.tar.gz core-29d72cac593d130e291aabb58685c0f6b7ffc59a.zip | |
ofz#3362 SYLK import: check ;X;Y;C;R col/row validity early
Change-Id: I37d5ce67f975b6b89c4b8a9baefae2467da2eb84
(cherry picked from commit 34ac0f9a0376b43bcff78a49ccaf4caa34c8c990)
Reviewed-on: https://gerrit.libreoffice.org/42277
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 70288a814c8b..f1e74326e3f0 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1753,15 +1753,35 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { case 'X': nCol = static_cast<SCCOL>(OUString(p).toInt32()) + nStartCol - 1; + if (nCol < 0 || MAXCOL < nCol) + { + SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;X invalid nCol=" << nCol); + nCol = std::max<SCCOL>( 0, std::min<SCCOL>( nCol, MAXCOL)); + } break; case 'Y': nRow = OUString(p).toInt32() + nStartRow - 1; + if (nRow < 0 || MAXROW < nRow) + { + SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;Y invalid nRow=" << nRow); + 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) + { + SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;C invalid nRefCol=" << nRefCol); + nRefCol = std::max<SCCOL>( 0, std::min<SCCOL>( nRefCol, MAXCOL)); + } break; case 'R': nRefRow = OUString(p).toInt32() + nStartRow - 1; + if (nRefRow < 0 || MAXROW < nRefRow) + { + SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;R invalid nRefRow=" << nRefRow); + nRefRow = std::max<SCROW>( 0, std::min<SCROW>( nRefRow, MAXROW)); + } break; case 'K': { |