diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-22 09:30:04 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-22 09:30:04 -0400 |
commit | eb81d5f23fc725f53857d7a62923e273a057c455 (patch) | |
tree | 5c1ba76e722d9630fa597023a1e6c196a04f758c /indra/llmessage/lldatapacker.cpp | |
parent | f8ccb39b8d944f9d2bf4308f909273cd5a35cbe7 (diff) | |
parent | 47985e5822ce9fdebb7443e13b3c1a781a842ecd (diff) |
Merge remote-tracking branch 'DRTVWR-600-maint-A' into nat/kwds
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..1545443798 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)) |