Second Life viewer sources 1.17.1.0

1 files changed, 8 insertions, 8 deletions

diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index ab41cca..d1c2875 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -1341,7 +1341,7 @@ LLMessageSystem::~LLMessageSystem()
         
         if (!mbError)
         {
-                end_net();
+                end_net(mSocket);
         }
         
         delete mTemplateMessageReader;
@@ -1355,6 +1355,9 @@ LLMessageSystem::~LLMessageSystem()
         delete mLLSDMessageReader;
         mLLSDMessageReader = NULL;
 
+        delete mLLSDMessageBuilder;
+        mLLSDMessageBuilder = NULL;
+
         delete mPollInfop;
         mPollInfop = NULL;
 
@@ -4164,11 +4167,13 @@ void LLMessageSystem::dumpPacketToLog()
         char line_buffer[256];          /* Flawfinder: ignore */
         S32 i;
         S32 cur_line_pos = 0;
-
         S32 cur_line = 0;
+
         for (i = 0; i < mTrueReceiveSize; i++)
         {
-                snprintf(line_buffer + cur_line_pos*3, sizeof(line_buffer),"%02x ", mTrueReceiveBuffer[i]);     /* Flawfinder: ignore */
+                S32 offset = cur_line_pos * 3;
+                snprintf(line_buffer + offset, sizeof(line_buffer) - offset,
+                                 "%02x ", mTrueReceiveBuffer[i]);       /* Flawfinder: ignore */
                 cur_line_pos++;
                 if (cur_line_pos >= 16)
                 {
@@ -4345,11 +4350,6 @@ std::string get_shared_secret()
 
 typedef std::map<const char*, LLMessageBuilder*> BuilderMap;
 
-static void setBuilder(BuilderMap& map, const char* name, LLMessageBuilder* builder)
-{
-        map[gMessageStringTable.getString(name)] = builder;
-}
-
 void LLMessageSystem::newMessageFast(const char *name)
 {
         if(LLMessageConfig::isMessageBuiltTemplate(name))