Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

network: Stricter handling of split packets

Browse Source
This commit is contained in:
sfan5 2019-08-15 16:11:01 +02:00
parent c4491165da
commit 2db0e93f73
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/network/connection.cpp
View File

@ -417,6 +417,11 @@ SharedBuffer<u8> IncomingSplitBuffer::insert(const BufferedPacket &p, bool relia
<< std::endl; << std::endl;
return SharedBuffer<u8>(); return SharedBuffer<u8>();
} }
if (chunk_num >= chunk_count) {
errorstream << "IncomingSplitBuffer::insert(): chunk_num=" << chunk_num
<< " >= chunk_count=" << chunk_count << std::endl;
return SharedBuffer<u8>();
}
// Add if doesn't exist // Add if doesn't exist
if (m_buf.find(seqnum) == m_buf.end()) { if (m_buf.find(seqnum) == m_buf.end()) {
@ -425,10 +430,12 @@ SharedBuffer<u8> IncomingSplitBuffer::insert(const BufferedPacket &p, bool relia
IncomingSplitPacket *sp = m_buf[seqnum]; IncomingSplitPacket *sp = m_buf[seqnum];
if (chunk_count != sp->chunk_count) if (chunk_count != sp->chunk_count) {
LOG(derr_con<<"Connection: WARNING: chunk_count="<<chunk_count errorstream << "IncomingSplitBuffer::insert(): chunk_count="
<<" != sp->chunk_count="<<sp->chunk_count << chunk_count << " != sp->chunk_count=" << sp->chunk_count
<<std::endl); << std::endl;
return SharedBuffer<u8>();
}
if (reliable != sp->reliable) if (reliable != sp->reliable)
LOG(derr_con<<"Connection: WARNING: reliable="<<reliable LOG(derr_con<<"Connection: WARNING: reliable="<<reliable
<<" != sp->reliable="<<sp->reliable <<" != sp->reliable="<<sp->reliable