svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26

Merge latest 1.26 into trunk

1 files changed, 29 insertions, 3 deletions

diff --git a/indra/llmessage/lldispatcher.cpp b/indra/llmessage/lldispatcher.cpp
index 7ce3d11be4..bb7c833b49 100644
--- a/indra/llmessage/lldispatcher.cpp
+++ b/indra/llmessage/lldispatcher.cpp
@@ -111,14 +111,40 @@ bool LLDispatcher::unpackMessage(
 		LLUUID& invoice,
 		LLDispatcher::sparam_t& parameters)
 {
+	char buf[MAX_STRING];	/*Flawfinder: ignore*/
 	msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method);
 	msg->getUUIDFast(_PREHASH_MethodData, _PREHASH_Invoice, invoice);
+	S32 size;
 	S32 count = msg->getNumberOfBlocksFast(_PREHASH_ParamList);
 	for (S32 i = 0; i < count; ++i)
 	{
-		std::string parameter;
-		msg->getStringFast(_PREHASH_ParamList,_PREHASH_Parameter, parameter, i);
-		parameters.push_back(parameter);
+		// we treat the SParam as binary data (since it might be an 
+		// LLUUID in compressed form which may have embedded \0's,)
+		size = msg->getSizeFast(_PREHASH_ParamList, i, _PREHASH_Parameter);
+		msg->getBinaryDataFast(
+			_PREHASH_ParamList, _PREHASH_Parameter,
+			buf, size, i, MAX_STRING-1);
+
+		// If the last byte of the data is 0x0, this is either a normally
+		// packed string, or a binary packed UUID (which for these messages
+		// are packed with a 17th byte 0x0).  Unpack into a std::string
+		// without the trailing \0, so "abc\0" becomes std::string("abc", 3)
+		// which matches const char* "abc".
+		if (size > 0
+			&& buf[size-1] == 0x0)
+		{
+			// special char*/size constructor because UUIDs may have embedded
+			// 0x0 bytes.
+			std::string binary_data(buf, size-1);
+			parameters.push_back(binary_data);
+		}
+		else
+		{
+			// This is either a NULL string, or a string that was packed 
+			// incorrectly as binary data, without the usual trailing '\0'.
+			std::string string_data(buf, size);
+			parameters.push_back(string_data);
+		}
 	}
 	return true;
 }