diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-11-23 10:04:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-23 18:35:54 +0100 |
| commit | f091877507618963eb186e928af5673a22f01457 (patch) | |
| tree | cbf276caf7abf88df9141ce9eddd4aa9a9d4d69d /dbaccess | |
| parent | e1488697f01ea80f2e835e600b4498f8b34003fe (diff) | |
Resolves: rhbz#1900428 don't crash on invalid index used in StarBasic macro
Change-Id: I05064f7e9216c9c43b49950b309afe72466857a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106241
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/api/RowSetBase.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index bc4b81b7a46d..4eabb3eb0bee 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -231,11 +231,16 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) OSL_ENSURE( pTemp != reinterpret_cast<void*>(0xfeeefeee),"HALT!" ); } OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow < m_pCache->getEnd() && aCacheIter != m_pCache->m_aCacheIterators.end(),"Invalid iterator set for currentrow!"); - ORowSetRow rRow = *m_aCurrentRow; - OSL_ENSURE(rRow.is() && o3tl::make_unsigned(columnIndex) < rRow->size(),"Invalid size of vector!"); #endif + ORowSetRow rRow = *m_aCurrentRow; + bool bValidPosition = rRow.is() && o3tl::make_unsigned(columnIndex) < rRow->size(); + if (!bValidPosition) + { + SAL_WARN("dbaccess", "ORowSetBase::getValue: Invalid size of vector!"); + ::dbtools::throwSQLException( DBA_RES( RID_STR_CURSOR_BEFORE_OR_AFTER ), StandardSQLState::INVALID_CURSOR_POSITION, *m_pMySelf ); + } m_nLastColumnIndex = columnIndex; - return (**m_aCurrentRow)[m_nLastColumnIndex]; + return (*rRow)[m_nLastColumnIndex]; } // we should normally never reach this |