#2393 BugSplat Crash #1504586: LLRenderTarget::getTexture(483)

LLGuru · LLGuru · commit 1cc1872c76de · 2024-08-22T18:47:44.000+02:00
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
@@ -475,12 +475,10 @@ void LLRenderTarget::clear(U32 mask_in)
 
 U32 LLRenderTarget::getTexture(U32 attachment) const
 {
-    if (attachment > mTex.size()-1)
-    {
-        LL_ERRS() << "Invalid attachment index." << LL_ENDL;
-    }
-    if (mTex.empty())
+    if (attachment >= mTex.size())
     {
+        LL_WARNS() << "Invalid attachment index " << attachment << " for size " << mTex.size() << LL_ENDL;
+        llassert(false);
         return 0;
     }
     return mTex[attachment];

Original file line number	Diff line number	Diff line change
`@@ -475,12 +475,10 @@ void LLRenderTarget::clear(U32 mask_in)`
`475`	`475`
`476`	`476`	`U32 LLRenderTarget::getTexture(U32 attachment) const`
`477`	`477`	`{`
`478`		`- if (attachment > mTex.size()-1)`
`479`		`- {`
`480`		`- LL_ERRS() << "Invalid attachment index." << LL_ENDL;`
`481`		`- }`
`482`		`- if (mTex.empty())`
	`478`	`+ if (attachment >= mTex.size())`
`483`	`479`	`{`
	`480`	`+ LL_WARNS() << "Invalid attachment index " << attachment << " for size " << mTex.size() << LL_ENDL;`
	`481`	`+ llassert(false);`
`484`	`482`	`return 0;`
`485`	`483`	`}`
`486`	`484`	`return mTex[attachment];`