Second Life viewer sources 1.15.1.3

1 files changed, 6 insertions, 4 deletions

diff --git a/linden/indra/llmessage/llpacketbuffer.cpp b/linden/indra/llmessage/llpacketbuffer.cpp
index 69144f5..525569d 100644
--- a/linden/indra/llmessage/llpacketbuffer.cpp
+++ b/linden/indra/llmessage/llpacketbuffer.cpp
@@ -42,11 +42,13 @@ LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32
         {
                 llerrs << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << llendl;
         }
-
-        if (datap != NULL)
+        else // we previously relied on llerrs being fatal to not get here...
         {
-                memcpy(mData, datap, size);     /*Flawfinder: ignore*/
-                mSize = size;
+                if (datap != NULL)
+                {
+                        memcpy(mData, datap, size);
+                        mSize = size;
+                }
         }
         
 }