diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 20:22:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 20:22:45 +0300 |
| commit | 4c54488470a37f53f46c9d4694644a10b92b9790 (patch) | |
| tree | 494487bbc57c79d17921b7443003d2a118e24ddb /indra/llmessage/lldatapacker.cpp | |
| parent | 398369233fc2621eb447701e26082057fb0c97d7 (diff) | |
| parent | 85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9 (diff) | |
Merge pull request #1316 from secondlife/marchcat/a-merge
Release (Maint YZ) -> Maint A merge
Diffstat (limited to 'indra/llmessage/lldatapacker.cpp')
| -rw-r--r-- | indra/llmessage/lldatapacker.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llmessage/lldatapacker.cpp b/indra/llmessage/lldatapacker.cpp index b3113cd5d8..745eb70f14 100644 --- a/indra/llmessage/lldatapacker.cpp +++ b/indra/llmessage/lldatapacker.cpp @@ -298,6 +298,13 @@ bool LLDataPackerBinaryBuffer::unpackBinaryData(U8 *value, S32 &size, const char } htolememcpy(&size, mCurBufferp, MVT_S32, 4); + + if (size < 0) + { + LL_WARNS() << "LLDataPackerBinaryBuffer::unpackBinaryData unpacked invalid size, aborting!" << LL_ENDL; + return FALSE; + } + mCurBufferp += 4; if (!verifyLength(size, name)) |