summaryrefslogtreecommitdiff
path: root/indra/llmessage/lltemplatemessagereader.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-23 14:08:11 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-23 14:08:11 +0000
commite7d9999359dd62509c685181d620b092ed28bc60 (patch)
tree595bc367bef76b80d04f7e3e7d95dfbeb31a13cd /indra/llmessage/lltemplatemessagereader.cpp
parent11e6e208d43f1347037fb312921a65af138f47b4 (diff)
parentaf77b7713444b9df58f451bdb1f30bdd4754fcbf (diff)
Merge from viewer-2-0
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;
}