summaryrefslogtreecommitdiff
path: root/indra/llimagej2coj/llimagej2coj.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2025-08-12 22:13:51 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-08-13 00:21:28 +0300
commit82e6e42b9ee62af0e39049e3d789457fe1a41281 (patch)
tree68c77257c8d33ffa00d9b09bd43ddaf95273fc6d /indra/llimagej2coj/llimagej2coj.cpp
parent922d2324d06326602fdf5770bc555e3e9f90e74b (diff)
#4527 Crash trying to upload a huge image
Raw image permits only a 256 MB buffer so this isn't unexpected.
Diffstat (limited to 'indra/llimagej2coj/llimagej2coj.cpp')
-rw-r--r--indra/llimagej2coj/llimagej2coj.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index c56e94aaa4..431f5aa001 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -897,6 +897,12 @@ bool LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
bool LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time, bool reversible)
{
+ if (raw_image.isBufferInvalid())
+ {
+ base.setLastError("Invalid input, no buffer");
+ return false;
+ }
+
JPEG2KEncode encode(comment_text, reversible);
bool encoded = encode.encode(raw_image, base);
if (!encoded)