Second Life viewer sources 1.18.0.6

1 files changed, 61 insertions, 7 deletions

diff --git a/linden/indra/llmessage/llsdmessagereader.cpp b/linden/indra/llmessage/llsdmessagereader.cpp
index 6312bee..6742edb 100755
--- a/linden/indra/llmessage/llsdmessagereader.cpp
+++ b/linden/indra/llmessage/llsdmessagereader.cpp
@@ -1,7 +1,38 @@
+/** 
+ * @file llsdmessagereader.cpp
+ * @brief LLSDMessageReader class implementation.
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#include "linden_common.h"
+
 #include "llsdmessagereader.h"
-#include "llsdutil.h"
+
 #include "llmessagebuilder.h"
 #include "llsdmessagebuilder.h"
+#include "llsdutil.h"
 
 LLSDMessageReader::LLSDMessageReader()
 {
@@ -15,11 +46,30 @@ LLSDMessageReader::~LLSDMessageReader()
 
 LLSD getLLSD(const LLSD& input, const char* block, const char* var, S32 blocknum)
 {
-        if(input[block].isArray())
+        // babbage: log error to llerrs if variable not found to mimic
+        // LLTemplateMessageReader::getData behaviour
+        if(NULL == block)
+        {
+                llerrs << "NULL block name" << llendl;
+                return LLSD();
+        }
+        if(NULL == var)
+        {
+                llerrs << "NULL var name" << llendl;
+                return LLSD();
+        }
+        if(! input[block].isArray())
         {
-                return input[block][blocknum][var];
+                llerrs << "block " << block << " not found" << llendl;
+                return LLSD();
         }
-        return LLSD();
+
+        LLSD result = input[block][blocknum][var]; 
+        if(result.isUndefined())
+        {
+                llerrs << "var " << var << " not found" << llendl;
+        }
+        return result;
 }
 
 //virtual 
@@ -167,8 +217,12 @@ void LLSDMessageReader::getIPPort(const char *block, const char *var,
 void LLSDMessageReader::getString(const char *block, const char *var, 
                                                    S32 buffer_size, char *buffer, S32 blocknum)
 {
+        if(buffer_size <= 0)
+        {
+                llwarns << "buffer_size <= 0" << llendl;
+                return;
+        }
         std::string data = getLLSD(mMessage, block, var, blocknum);
-        
         S32 data_size = data.size();
         if (data_size >= buffer_size)
         {
@@ -241,7 +295,7 @@ void LLSDMessageReader::clearMessage()
 //virtual 
 const char* LLSDMessageReader::getMessageName() const
 {
-        return mMessageName.c_str();
+        return mMessageName;
 }
 
 // virtual 
@@ -256,7 +310,7 @@ void LLSDMessageReader::copyToBuilder(LLMessageBuilder& builder) const
         builder.copyFromLLSD(mMessage);
 }
 
-void LLSDMessageReader::setMessage(const std::string& name, const LLSD& message)
+void LLSDMessageReader::setMessage(const char* name, const LLSD& message)
 {
         mMessageName = name;
         // TODO: Validate