summaryrefslogtreecommitdiff
path: root/indra/llimage/llimagejpeg.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2025-08-24 14:29:24 -0700
committerGitHub <noreply@github.com>2025-08-24 14:29:24 -0700
commitf25c2a56c0c8079163e9ef18f6a9e590341b1e1a (patch)
treea3fa4bd843f919575aaddf0928eff38bae7d7b04 /indra/llimage/llimagejpeg.cpp
parent96023976f5af0b9af8e8d066d9ad4eea213f53ee (diff)
parent375158eb6450a0291ec1a0f55714fbf19a8287eb (diff)
Merge pull request #4602 from secondlife/rider/release_to_luaedit
Rider/release to luaedit
Diffstat (limited to 'indra/llimage/llimagejpeg.cpp')
-rw-r--r--indra/llimage/llimagejpeg.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
index 0e7ec365d4..effd33b410 100644
--- a/indra/llimage/llimagejpeg.cpp
+++ b/indra/llimage/llimagejpeg.cpp
@@ -491,6 +491,12 @@ bool LLImageJPEG::encode( const LLImageRaw* raw_image, F32 encode_time )
resetLastError();
+ if (raw_image->isBufferInvalid())
+ {
+ setLastError("Invalid input, no buffer");
+ return false;
+ }
+
LLImageDataSharedLock lockIn(raw_image);
LLImageDataLock lockOut(this);