incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restrict externally-generated item ID range further

Browse Source
This commit is contained in:
Martin Michelsen
2023-10-26 11:25:27 -07:00
parent 700b1497d6
commit 12fbdbbcdd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Lobby.cc
+4 -1
View File
@@ -336,7 +336,10 @@ void Lobby::on_item_id_generated_externally(uint8_t client_id, uint32_t item_id)
if (this->base_version == GameVersion::BB) { if (this->base_version == GameVersion::BB) {
throw logic_error("BB games cannot have externally-generated item IDs"); throw logic_error("BB games cannot have externally-generated item IDs");
} }
if ((item_id > 0x00010000) && (item_id < 0x02010000)) { // Note: The client checks for the range (0x00010000, 0x02010000) here, but
// server-side item drop logic uses 0x00810000 as its base ID, so we restrict
// the range further here.
if ((item_id > 0x00010000) && (item_id < 0x00810000)) {
uint16_t item_client_id = (item_id >> 21) & 0x7FF; uint16_t item_client_id = (item_id >> 21) & 0x7FF;
if (item_client_id != client_id) { if (item_client_id != client_id) {
throw runtime_error("externally-generated item ID does not match expected client ID"); throw runtime_error("externally-generated item ID does not match expected client ID");