diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-04-30 09:40:14 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-04-30 09:40:14 +0800 |
commit | c0a2498fa1ff074fa29b31bbd63b2ac6f69b38bb (patch) | |
tree | 0909d51200a3de225f20ebe7d0aa7cb95fb380e1 /indra/llmessage | |
parent | 39cc9a1706340d6f84b152593a4d8aaeeaa88b56 (diff) | |
parent | d9e55c44152064133796bfb08f1da524387c1300 (diff) |
Merge tag 'Second_Life_Release#d9e55c44-Second_Life_Release#d9e55c4-2025.04' into 2025.04
Diffstat (limited to 'indra/llmessage')
-rw-r--r-- | indra/llmessage/llpacketring.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llmessage/llpacketring.cpp b/indra/llmessage/llpacketring.cpp index eb6650c6c5..b8284334ea 100644 --- a/indra/llmessage/llpacketring.cpp +++ b/indra/llmessage/llpacketring.cpp @@ -209,8 +209,14 @@ S32 LLPacketRing::receiveOrDropBufferedPacket(char *datap, bool drop) if (!drop) { - assert(packet_size > 0); - memcpy(datap, packet->getData(), packet_size); + if (packet_size > 0) + { + memcpy(datap, packet->getData(), packet_size); + } + else + { + assert(false); + } } else { |