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

merge -r 56266 release-candidate 

merge -r 56301 release-candidate
Fixes for llxfer.cpp and llaudiodecodemgr.cpp (asset upload truncation bug)
llxfer.cpp got missed somehow the first time round, grr!
master
Steven Bennetts 2007-01-13 00:06:17 +00:00
parent 46444df6de
commit dbf45ad429
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/llmessage/llxfer.cpp
View File

@ -190,19 +190,26 @@ void LLXfer::sendPacket(S32 packet_num)
if (packet_num)
{
num_copy = llmin(fdata_size, (S32)sizeof(fdata_buf));
num_copy = llmin(num_copy, (S32)(sizeof(mBuffer) - desired_read_position));
num_copy = llmin(num_copy, (S32)(mBufferLength - desired_read_position));
if (num_copy > 0)
{
memcpy(fdata_buf,&mBuffer[desired_read_position],num_copy);
}
}
else // if we're the first packet, encode size as an additional S32 at start of data
{
else
{
// if we're the first packet, encode size as an additional S32
// at start of data.
num_copy = llmin(fdata_size, (S32)(sizeof(fdata_buf)-sizeof(S32)));
num_copy = llmin(num_copy, (S32)(sizeof(mBuffer) - desired_read_position));
num_copy = llmin(
num_copy,
(S32)(mBufferLength - desired_read_position));
if (num_copy > 0)
{
memcpy(fdata_buf+sizeof(S32),&mBuffer[desired_read_position],fdata_size);
memcpy(
fdata_buf + sizeof(S32),
&mBuffer[desired_read_position],
num_copy);
}
fdata_size += sizeof(S32);
htonmemcpy(fdata_buf,&mXferSize, MVT_S32, sizeof(S32));