diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-22 22:45:56 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-22 22:45:56 -0400 |
| commit | 5893d3c47ecb8d422bb4161f752762dc7289eae0 (patch) | |
| tree | 7c578c2d9bcf6ebd3660461e5453e7b4acc45e4e /indra | |
| parent | 149371d5527d87a04c89f515e5719b0b3350eec7 (diff) | |
| parent | 61d2caee9f9474a6ccb6c13a4727e3527bd7c938 (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmessage/lltemplatemessagebuilder.cpp | 2 | ||||
| -rw-r--r-- | indra/llmessage/lltemplatemessagereader.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_edit_profile.xml | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/indra/llmessage/lltemplatemessagebuilder.cpp b/indra/llmessage/lltemplatemessagebuilder.cpp index 55379fc6fd..fa02456d90 100644 --- a/indra/llmessage/lltemplatemessagebuilder.cpp +++ b/indra/llmessage/lltemplatemessagebuilder.cpp @@ -326,7 +326,7 @@ void LLTemplateMessageBuilder::addData(const char *varname, const void *data, EM << "(" << size << "). Clamping size and truncating data." << llendl; size = 255; char *truncate = (char *)data; - truncate[255] = 0; + truncate[254] = 0; // array size is 255 but the last element index is 254 } // no correct size for MVT_VARIABLE, instead we need to tell how many bytes the size will be encoded as 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; } diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 26be8440e7..dff2b9a214 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -146,7 +146,7 @@ layout="topleft" left="123" top="25" - max_length="512" + max_length="511" name="sl_description_edit" width="157" word_wrap="true"> @@ -200,7 +200,7 @@ height="102" layout="topleft" left="123" - max_length="512" + max_length="254" top="157" name="fl_description_edit" width="157" |