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

FIRE-34588 - Bugsplat due to unhandled runtime exception in datapacker 

Revert older change that throws throw an exception. FS had replaced the conditional check and bool return with an exception, but the exception is never caught. The return value is however checked so lets do that.
master
Beq 2024-09-30 13:47:26 +01:00
parent b0f7ad8e18
commit 51ffb15749
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/llmessage/lldatapacker.h
View File

@ -213,18 +213,9 @@ inline bool LLDataPackerBinaryBuffer::verifyLength(const S32 data_size, const ch
{
if (mWriteEnabled && (mCurBufferp - mBufferp) > mBufferSize - data_size)
{
// <FS:ND> Handle invalid packets by throwing an exception and a graceful continue
//LL_WARNS() << "Buffer overflow in BinaryBuffer length verify, field name " << name << "!" << LL_ENDL;
//LL_WARNS() << "Current pos: " << (int)(mCurBufferp - mBufferp) << " Buffer size: " << mBufferSize << " Data size: " << data_size << LL_ENDL;
// return false;
std::stringstream strm;
strm << "Buffer overflow in BinaryBuffer length verify, field name " << name << "!" << std::endl;
strm << "Current pos: " << (int)(mCurBufferp - mBufferp) << " Buffer size: " << mBufferSize << " Data size: " << data_size << std::endl;
throw nd::exceptions::xran( strm.str() );
// </FS:ND>
LL_WARNS() << "Buffer overflow in BinaryBuffer length verify, field name " << name << "!" << LL_ENDL;
LL_WARNS() << "Current pos: " << (int)(mCurBufferp - mBufferp) << " Buffer size: " << mBufferSize << " Data size: " << data_size << LL_ENDL;
return false;
}
return true;