Merge tag 'Second_Life_Release#37a04baf-2025.06' into 2025.06

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/llimage/llimagebmp.cpp b/indra/llimage/llimagebmp.cpp
index 2a328675c2..c8f99380ea 100644
--- a/indra/llimage/llimagebmp.cpp
+++ b/indra/llimage/llimagebmp.cpp
@@ -558,6 +558,12 @@ bool LLImageBMP::encode(const LLImageRaw* raw_image, F32 encode_time)
         LL_INFOS() << "Dropping alpha information during BMP encoding" << LL_ENDL;
     }
 
+    if (raw_image->isBufferInvalid())
+    {
+        setLastError("Invalid input, no buffer");
+        return false;
+    }
+
     setSize(raw_image->getWidth(), raw_image->getHeight(), dst_components);
 
     U8 magic[14];