BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2026-06-22 16:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

enforce expected recv size during event and server info tcp recv, remove unused instance of CheckBytes function

Browse Source
This commit is contained in:
Katharine Chui
2026-05-11 11:08:15 +02:00
parent 23760da53b
commit 30639abb88
4 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Network/Core.cpp
+6 -7
View File
@@ -145,27 +145,26 @@ void GetServerInfo(std::string Data) {
std::vector<char> data(sizeof(Header));
int Temp = RecvWaitAll(ISock, data.data(), sizeof(Header));
auto checkBytes = ([&](const int32_t bytes) -> bool {
auto checkBytes = ([&](const int32_t bytes, const int32_t expected = -1) -> bool {
if (bytes == 0) {
return false;
} else if (bytes < 0) {
return false;
}
if (expected != -1 && bytes != expected) {
return false;
}
return true;
});
if (!checkBytes(Temp)) {
if (!checkBytes(Temp, sizeof(Header))) {
return "";
}
memcpy(&Header, data.data(), sizeof(Header));
if (!checkBytes(Temp)) {
return "";
}
data.resize(Header, 0);
Temp = RecvWaitAll(ISock, data.data(), Header);
if (!checkBytes(Temp)) {
if (!checkBytes(Temp, Header)) {
return "";
}
return std::string(data.data(), Header);