summaryrefslogtreecommitdiff
path: root/indra/llmessage/llpacketring.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-05-29 12:35:27 +0800
committerErik Kundiman <erik@megapahit.org>2025-05-29 12:35:27 +0800
commitd046d7e0e1e3ccbffb42d22fe52aa73d0c170b8e (patch)
tree7c2023e55955c9aed55db9331bae164a386a2d21 /indra/llmessage/llpacketring.cpp
parent6641e36082f27faa282a0af6f88f381ffc97e179 (diff)
parent11d75418fce8372e9976b069070d9d0506766d0d (diff)
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/llmessage/llpacketring.cpp')
-rw-r--r--indra/llmessage/llpacketring.cpp10
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
{