summaryrefslogtreecommitdiff
path: root/indra/llmessage/lltemplatemessagereader.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-29 16:24:58 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-03-29 16:24:58 -0700
commit86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (patch)
tree35ab8edbc364a05a5d29d343f63b22e01ea5cb38 /indra/llmessage/lltemplatemessagereader.cpp
parent3fca923949667d1c713119043cd4aaeae4acfe09 (diff)
parent8654ba5e2571e07c8d2fd898027abf6f85777905 (diff)
Automated merge
Diffstat (limited to 'indra/llmessage/lltemplatemessagereader.cpp')
-rw-r--r--indra/llmessage/lltemplatemessagereader.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index 6682575ca5..8f56cf2521 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -433,10 +433,9 @@ inline void LLTemplateMessageReader::getString(const char *block, const char *va
inline void LLTemplateMessageReader::getString(const char *block, const char *var, std::string& outstr, S32 blocknum )
{
- char s[MTUBYTES];
- s[0] = '\0';
+ char s[MTUBYTES + 1]= {0}; // every element is initialized with 0
getData(block, var, s, 0, blocknum, MTUBYTES);
- s[MTUBYTES - 1] = '\0';
+ s[MTUBYTES] = '\0';
outstr = s;
}