diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-05-12 17:09:30 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-05-12 17:09:30 +0000 |
| commit | 44f70be1e447664ec3ee050e85a8e14965fff4e7 (patch) | |
| tree | c1a5c851a06dd77a27cbc135e4625701e743902e /indra/llcommon/llalignedarray.h | |
| parent | 4cfcbca748e825b4904e7f136fa625b1a0f79dfb (diff) | |
| parent | 915de3eb556c22216fd3c76e2de4a2ab1953dbe0 (diff) | |
Merged DRTVWR-544-maint into SL-12238
Diffstat (limited to 'indra/llcommon/llalignedarray.h')
| -rw-r--r-- | indra/llcommon/llalignedarray.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llcommon/llalignedarray.h b/indra/llcommon/llalignedarray.h index b68e9e0f82..da9d98c16c 100644 --- a/indra/llcommon/llalignedarray.h +++ b/indra/llcommon/llalignedarray.h @@ -116,14 +116,20 @@ void LLAlignedArray<T, alignment>::resize(U32 size) template <class T, U32 alignment> T& LLAlignedArray<T, alignment>::operator[](int idx) { - llassert(idx < mElementCount); + if(idx >= mElementCount || idx < 0) + { + LL_ERRS() << "Out of bounds LLAlignedArray, requested: " << (S32)idx << " size: " << mElementCount << LL_ENDL; + } return mArray[idx]; } template <class T, U32 alignment> const T& LLAlignedArray<T, alignment>::operator[](int idx) const { - llassert(idx < mElementCount); + if (idx >= mElementCount || idx < 0) + { + LL_ERRS() << "Out of bounds LLAlignedArray, requested: " << (S32)idx << " size: " << mElementCount << LL_ENDL; + } return mArray[idx]; } |