From f0b218f1e251c5bcac6e4b3f0d4faf8984ffca58 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Thu, 16 Jun 2022 22:07:45 -0500 Subject: [PATCH] fix shape errorcodes corrects out of bounds flaw --- Engine/source/T3D/assets/ShapeAsset.cpp | 2 +- Engine/source/T3D/assets/ShapeAsset.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/T3D/assets/ShapeAsset.cpp b/Engine/source/T3D/assets/ShapeAsset.cpp index 1ab7c7893..17145079c 100644 --- a/Engine/source/T3D/assets/ShapeAsset.cpp +++ b/Engine/source/T3D/assets/ShapeAsset.cpp @@ -117,7 +117,7 @@ ConsoleSetType(TypeShapeAssetId) //----------------------------------------------------------------------------- -const String ShapeAsset::mErrCodeStrings[] = +const String ShapeAsset::mShapeErrCodeStrings[] = { "TooManyVerts", "TooManyBones", diff --git a/Engine/source/T3D/assets/ShapeAsset.h b/Engine/source/T3D/assets/ShapeAsset.h index bdb53f430..c648b0750 100644 --- a/Engine/source/T3D/assets/ShapeAsset.h +++ b/Engine/source/T3D/assets/ShapeAsset.h @@ -104,7 +104,7 @@ public: static StringTableEntry smNoShapeAssetFallback; - static const String mErrCodeStrings[ShapeAssetErrCode::Extended - Parent::Extended + 1]; + static const String mShapeErrCodeStrings[ShapeAssetErrCode::Extended - Parent::Extended + 1]; static U32 getAssetErrCode(AssetPtr shapeAsset) { if (shapeAsset) return shapeAsset->mLoadedState; else return 0; } @@ -112,7 +112,7 @@ public: { if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode); if (errCode > ShapeAssetErrCode::Extended) return "undefined error"; - return mErrCodeStrings[errCode]; + return mShapeErrCodeStrings[errCode - Parent::Extended]; }; ShapeAsset();