diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-16 06:39:13 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-16 06:39:13 +0800 |
| commit | 2d8948ef173c5bfc37834301f4aa4fb72e78f03c (patch) | |
| tree | 68b8ce2297ec590ac3f5af2e4f34736f15d7e193 /indra/llimage/llimagejpeg.cpp | |
| parent | 977b636f37cd4a53caa1db084c07294f67212c0e (diff) | |
| parent | 37a04baf104aa394615d8e8286522988ba56c09d (diff) | |
Merge tag 'Second_Life_Release#37a04baf-2025.06' into 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 dd3efb3459..71b139bc82 100644 --- a/indra/llimage/llimagejpeg.cpp +++ b/indra/llimage/llimagejpeg.cpp @@ -497,6 +497,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); |