livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Kent Quirk 2010-03-22 22:45:56 -04:00
parent 149371d552 61d2caee9f
commit 5893d3c47e
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmessage/lltemplatemessagebuilder.cpp
View File

@ -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

5
indra/llmessage/lltemplatemessagereader.cpp
View File

@ -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;
}

4
indra/newview/skins/default/xui/en/panel_edit_profile.xml
View File

@ -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"