mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-12 04:03:53 +00:00
LCEMP RCE fixes
Based on commit d017bfc30a68888bf5c79b23cf5c4f607cf828bf
This commit is contained in:
parent
0c4f459904
commit
d557ca2dfb
27 changed files with 222 additions and 80 deletions
|
|
@ -53,9 +53,25 @@ void ByteArrayOutputStream::write(byteArray b, unsigned int offset, unsigned int
|
|||
{
|
||||
assert( b.length >= offset + length );
|
||||
|
||||
if (offset > b.length || length > b.length - offset)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (length > 0xFFFFFFFF - count)
|
||||
{
|
||||
return;
|
||||
|
||||
// If we will fill the buffer we need to make it bigger
|
||||
if( count + length >= buf.length )
|
||||
buf.resize( max( count + length + 1, buf.length * 2 ) );
|
||||
{
|
||||
unsigned int newSize = (std::max)(count + length + 1, buf.length * 2);
|
||||
if (newSize <= buf.length)
|
||||
{
|
||||
return;
|
||||
}
|
||||
buf.resize(newSize);
|
||||
}
|
||||
|
||||
XMemCpy( &buf[count], &b[offset], length );
|
||||
//std::copy( b->data+offset, b->data+offset+length, buf->data + count ); // Or this instead?
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue