diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-08-29 12:48:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-29 12:48:44 -0400 |
| commit | 842ac1e1503e41662c924289905b43b336b52a53 (patch) | |
| tree | d8067fc99f6c699e3d15510c8521a32102f5cb30 /indra/llimage/llimagejpeg.cpp | |
| parent | 28678996ceaea019aafaa26911a440769320c498 (diff) | |
| parent | 787b63f4c29f6ef56f355ec80084458a1bbcfb35 (diff) | |
Merge pull request #4379 from secondlife/release/2025.06
Release/2025.06
Diffstat (limited to 'indra/llimage/llimagejpeg.cpp')
| -rw-r--r-- | indra/llimage/llimagejpeg.cpp | 6 |
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); |