sc/source/filter/excel/xestyle.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit a5f229206260fbf8f47827786645c7a1bd048aa2 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Fri Oct 19 10:10:27 2018 +0100 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Fri Oct 26 22:02:55 2018 +0200 index validity check looks dubious Change-Id: I0952bbaabeb8353b27b478ad6b17bc9348c6f61a Reviewed-on: https://gerrit.libreoffice.org/61992 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index b9986f338e48..bdf1e853a51d 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2600,7 +2600,7 @@ sal_uInt16 XclExpXFBuffer::GetXFIndex( sal_uInt32 nXFId ) const sal_Int32 XclExpXFBuffer::GetXmlStyleIndex( sal_uInt32 nXFIndex ) const { OSL_ENSURE( nXFIndex < maStyleIndexes.size(), "XclExpXFBuffer::GetXmlStyleIndex - invalid index!" ); - if( nXFIndex > maStyleIndexes.size() ) + if( nXFIndex >= maStyleIndexes.size() ) return 0; // should be caught/debugged via above assert; return "valid" index. return maStyleIndexes[ nXFIndex ]; } @@ -2608,7 +2608,7 @@ sal_Int32 XclExpXFBuffer::GetXmlStyleIndex( sal_uInt32 nXFIndex ) const sal_Int32 XclExpXFBuffer::GetXmlCellIndex( sal_uInt32 nXFIndex ) const { OSL_ENSURE( nXFIndex < maCellIndexes.size(), "XclExpXFBuffer::GetXmlStyleIndex - invalid index!" ); - if( nXFIndex > maCellIndexes.size() ) + if( nXFIndex >= maCellIndexes.size() ) return 0; // should be caught/debugged via above assert; return "valid" index. return maCellIndexes[ nXFIndex ]; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits