diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-06-14 10:51:13 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-09-23 14:27:39 +0200 |
| commit | 8ed94c58e836d30d981da134f336884d040af13d (patch) | |
| tree | ec30107bcb793eb568d1aa0e546d319e23eac294 | |
| parent | forcepoint#97 avoid Invalid read of size 2 (diff) | |
| download | core-8ed94c58e836d30d981da134f336884d040af13d.tar.gz core-8ed94c58e836d30d981da134f336884d040af13d.zip | |
crashtesting: crash seen on exporting forum-it-5909.ods to xlsx
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135752
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 8e14296fcf11bafe91f3ec45598841ba117b20b8)
Change-Id: I64b629e2f5b0ece7f903049bd006775463f97586
| -rw-r--r-- | sc/source/core/data/dptabres.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 38107b70e09f..d3e0d108f38a 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -2769,7 +2769,10 @@ ScDPResultDimension::~ScDPResultDimension() ScDPResultMember *ScDPResultDimension::FindMember( SCROW iData ) const { if( bIsDataLayout ) - return maMemberArray[0].get(); + { + SAL_WARN_IF(maMemberArray.empty(), "sc.core", "MemberArray is empty"); + return !maMemberArray.empty() ? maMemberArray[0].get() : nullptr; + } MemberHash::const_iterator aRes = maMemberHash.find( iData ); if( aRes != maMemberHash.end()) { @@ -2976,8 +2979,11 @@ void ScDPResultDimension::LateInitFrom( long ScDPResultDimension::GetSize(long nMeasure) const { - long nTotal = 0; long nMemberCount = maMemberArray.size(); + if (!nMemberCount) + return 0; + + long nTotal = 0; if (bIsDataLayout) { OSL_ENSURE(nMeasure == SC_DPMEASURE_ALL || pResultData->GetMeasureCount() == 1, @@ -3130,7 +3136,7 @@ void ScDPResultDimension::SortMembers( ScDPResultMember* pRefMember ) // handle children // for data layout, call only once - sorting measure is always taken from settings - long nLoopCount = bIsDataLayout ? 1 : nCount; + long nLoopCount = bIsDataLayout ? std::min<long>(1, nCount) : nCount; for (long i=0; i<nLoopCount; i++) { ScDPResultMember* pMember = maMemberArray[i].get(); |