TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #817 from Azaezel/alpha40/arrayObjectOutOfBoundFix2

Browse source 
fix out of bounds reference in arrayobject
This commit is contained in:
Brian Roberts 2022-06-13 21:38:07 -05:00 committed by GitHub
parent 5fb227a1e7 c91002d5ec
commit fedee8d2a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Engine/source/console/arrayObject.cpp
View file

@ -155,8 +155,9 @@ bool ArrayObject::_addKeyFromField( void *object, const char *index, const char
S32 ArrayObject::getIndexFromValue( const String &value ) const
{
S32 currentIndex = mMin(mCurrentIndex, 0);
S32 foundIndex = -1;
for ( S32 i = mCurrentIndex; i < mArray.size(); i++ )
for ( S32 i = currentIndex; i < mArray.size(); i++ )
{
if ( isEqual( mArray[i].value, value ) )
{
@ -167,7 +168,7 @@ S32 ArrayObject::getIndexFromValue( const String &value ) const
if( foundIndex < 0 )
{
for ( S32 i = 0; i < mCurrentIndex; i++ )
for ( S32 i = 0; i < currentIndex; i++ )
{
if ( isEqual( mArray[i].value, value ) )
{
@ -184,8 +185,9 @@ S32 ArrayObject::getIndexFromValue( const String &value ) const
S32 ArrayObject::getIndexFromKey( const String &key ) const
{
S32 currentIndex = mMin(mCurrentIndex, 0);
S32 foundIndex = -1;
for ( S32 i = mCurrentIndex; i < mArray.size(); i++ )
for ( S32 i = currentIndex; i < mArray.size(); i++ )
{
if ( isEqual( mArray[i].key, key ) )
{
@ -196,7 +198,7 @@ S32 ArrayObject::getIndexFromKey( const String &key ) const
if( foundIndex < 0 )
{
for ( S32 i = 0; i < mCurrentIndex; i++ )
for ( S32 i = 0; i < currentIndex; i++ )
{
if ( isEqual( mArray[i].key, key ) )
{
@ -213,8 +215,9 @@ S32 ArrayObject::getIndexFromKey( const String &key ) const
S32 ArrayObject::getIndexFromKeyValue( const String &key, const String &value ) const
{
S32 currentIndex = mMin(mCurrentIndex, 0);
S32 foundIndex = -1;
for ( S32 i = mCurrentIndex; i < mArray.size(); i++ )
for ( S32 i = currentIndex; i < mArray.size(); i++ )
{
if ( isEqual( mArray[i].key, key ) && isEqual( mArray[i].value, value ) )
{
@ -225,7 +228,7 @@ S32 ArrayObject::getIndexFromKeyValue( const String &key, const String &value )
if ( foundIndex < 0 )
{
for ( S32 i = 0; i < mCurrentIndex; i++ )
for ( S32 i = 0; i < currentIndex; i++ )
{
if ( isEqual( mArray[i].key, key ) && isEqual( mArray[i].value, value ) )
{