#5380 Fix crash in LLImageGL::analyzeAlpha()

marchcat · marchcat · commit ee3242a56372 · 2026-02-06T18:59:56.000+02:00
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
@@ -2189,7 +2189,7 @@ void LLImageGL::calcAlphaChannelOffsetAndStride()
 
 void LLImageGL::analyzeAlpha(const void* data_in, U32 w, U32 h)
 {
-    if(sSkipAnalyzeAlpha || !mNeedsAlphaAndPickMask)
+    if(!data_in || sSkipAnalyzeAlpha || !mNeedsAlphaAndPickMask)
     {
         return ;
     }

Original file line number	Diff line number	Diff line change
`@@ -2189,7 +2189,7 @@ void LLImageGL::calcAlphaChannelOffsetAndStride()`
`2189`	`2189`
`2190`	`2190`	`void LLImageGL::analyzeAlpha(const void* data_in, U32 w, U32 h)`
`2191`	`2191`	`{`
`2192`		`- if(sSkipAnalyzeAlpha \|\| !mNeedsAlphaAndPickMask)`
	`2192`	`+ if(!data_in \|\| sSkipAnalyzeAlpha \|\| !mNeedsAlphaAndPickMask)`
`2193`	`2193`	`{`
`2194`	`2194`	`return ;`
`2195`	`2195`	`}`