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

svn merge -r 79455:79892 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Server --> release 

* DEV-10498 The agentN-ds host name was constructed incorrectly and caused services_base_url to be incorrect
* Fixed a potential crash bug caused by LSL library functions returning null pointers instead of empty strings.
meow-7.2.2
Josh Bell 2008-02-13 18:07:18 +00:00
parent 54e428d209
commit e7f1f45510
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/lscript/lscript_byteconvert.h
View File

@ -168,7 +168,7 @@ inline void bytestream2char(char *buffer, const U8 *stream, S32 &offset)
;
}
inline void char2bytestream(U8 *stream, S32 &offset, char *buffer)
inline void char2bytestream(U8 *stream, S32 &offset, const char *buffer)
{
while ((*(stream + offset++) = *buffer++))
;

10
indra/lscript/lscript_library/lscript_alloc.cpp
View File

@ -131,10 +131,12 @@ S32 lsa_heap_add_data(U8 *buffer, LLScriptLibData *data, S32 heapsize, BOOL b_de
size = 4;
break;
case LST_KEY:
size = (S32)strlen(data->mKey) + 1; /*Flawfinder: ignore*/
// NOTE: babbage: defensive as some library calls set data to NULL
size = data->mKey ? (S32)strlen(data->mKey) + 1 : 1; /*Flawfinder: ignore*/
break;
case LST_STRING:
size = (S32)strlen(data->mString) + 1; /*Flawfinder: ignore*/
// NOTE: babbage: defensive as some library calls set data to NULL
size = data->mString ? (S32)strlen(data->mString) + 1 : 1; /*Flawfinder: ignore*/
break;
case LST_LIST:
// list data 4 bytes of number of entries followed by number of pointer
@ -294,10 +296,10 @@ void lsa_insert_data(U8 *buffer, S32 &offset, LLScriptLibData *data, LLScriptAll
float2bytestream(buffer, offset, data->mFP);
break;
case LST_KEY:
char2bytestream(buffer, offset, data->mKey);
char2bytestream(buffer, offset, data->mKey ? data->mKey : "");
break;
case LST_STRING:
char2bytestream(buffer, offset, data->mString);
char2bytestream(buffer, offset, data->mString ? data->mString : "");
break;
case LST_VECTOR:
vector2bytestream(buffer, offset, data->mVec);