summaryrefslogtreecommitdiff
path: root/indra/llmessage/llpacketring.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2025-05-28 22:48:17 +0300
committerGitHub <noreply@github.com>2025-05-28 22:48:17 +0300
commit91adb11d10fe0c18790be64fa7a6ce5b0bbdcb09 (patch)
tree3e5294e3b8ff07778e6134ed9dd41458386032ac /indra/llmessage/llpacketring.cpp
parentb9ab6c3644da02bed6941dc8df433fb1c626f8c7 (diff)
parentb08ba3fa7bc9e6309891e510fbfb5c4e2b5c922e (diff)
Merge pull request #4183 from secondlife/marchcat/2505-merge
Marchcat/2505 merge
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
{