metin2/server
metin2
/
server
2
2
Fork 9
Code Issues 15 Pull Requests 2 Packages Projects Releases Wiki Activity

Fixed serious issue where oversized packets would be split apart by libevent without proper handling by the db core. Removed Google Sanitizers

This commit is contained in:
Exynox 2022-11-27 10:46:56 +02:00
parent b5ea548038
commit 972530f3a7
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/CMakeLists.txt
View File

@ -26,6 +26,3 @@ find_package(Libevent CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE libevent::core libevent::extra libevent::pthreads)
target_link_libraries(${PROJECT_NAME} PRIVATE libpoly libsql libthecore)
# Memory debugging
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -g")

20
db/src/Peer.cpp
View File

@ -63,12 +63,19 @@ void CPeer::SetUserCount(DWORD dwCount)
bool CPeer::PeekPacket(int & iBytesProceed, BYTE & header, DWORD & dwHandle, DWORD & dwLength, const char ** data)
{
// Return if not enough data was received to read the header
if (GetRecvLength() < iBytesProceed + 9)
return false;
const char * buf = (const char *) GetRecvBuffer(iBytesProceed + 9);
if (!buf) {
sys_err("PeekPacket: Failed to get network buffer!");
return false;
}
buf += iBytesProceed;
// Read the header data
header = *(buf++);
dwHandle = *((DWORD *) buf);
@ -77,7 +84,7 @@ bool CPeer::PeekPacket(int & iBytesProceed, BYTE & header, DWORD & dwHandle, DWO
dwLength = *((DWORD *) buf);
buf += sizeof(DWORD);
//sys_log(0, "%d header %d handle %u length %u", GetRecvLength(), header, dwHandle, dwLength);
// Ensure that all the data was fully received
if (iBytesProceed + dwLength + 9 > (DWORD) GetRecvLength())
{
sys_log(0, "PeekPacket: not enough buffer size: len %u, recv %d",
@ -85,6 +92,17 @@ bool CPeer::PeekPacket(int & iBytesProceed, BYTE & header, DWORD & dwHandle, DWO
return false;
}
// Ensure that all the required data is available in a contiguous area
buf = (const char *) GetRecvBuffer(iBytesProceed + dwLength + 9);
if (!buf) {
sys_err("PeekPacket: Failed to get network buffer!");
return false;
}
// Skip the header
buf += iBytesProceed + 9;
// Set the data pointer
*data = buf;
iBytesProceed += dwLength + 9;
return true;

1
game/CMakeLists.txt
View File

@ -49,4 +49,3 @@ find_package (Threads REQUIRED)
target_link_libraries (${PROJECT_NAME} Threads::Threads)
target_link_libraries(${PROJECT_NAME} libgame libpoly libsql libthecore liblua)