summaryrefslogtreecommitdiff
path: root/indra/llmessage/llpacketring.cpp
diff options
context:
space:
mode:
authorRye <rye@alchemyviewer.org>2025-08-20 18:04:55 -0400
committerRye <rye@alchemyviewer.org>2025-08-20 18:04:55 -0400
commitba30737d8f4add8ddd8c77d18df6497b46583fe9 (patch)
tree81e5412a364ff80b5250fe6db9e653d35621c20e /indra/llmessage/llpacketring.cpp
parentf0db568bf8d313a00e10c1c4ee4dd7f716a9d987 (diff)
parentd5f748c91c650a2ec534c497b9e098ccb317d70b (diff)
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
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
{