BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Inventory: Fix rare out-of-bounds access

Browse Source 
Co-authored-by: Thomas--S <info@thomas-stangl.de>
This commit is contained in:
SmallJoker 2021-08-23 14:10:17 +02:00 committed by GitHub
parent dad87a360b
commit eea488ed75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/inventorymanager.cpp
View File

@ -273,7 +273,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
} }
if (!list_to) { if (!list_to) {
infostream << "IMoveAction::apply(): FAIL: destination list not found: " infostream << "IMoveAction::apply(): FAIL: destination list not found: "
<< "to_inv=\""<<to_inv.dump() << "\"" << "to_inv=\"" << to_inv.dump() << "\""
<< ", to_list=\"" << to_list << "\"" << std::endl; << ", to_list=\"" << to_list << "\"" << std::endl;
return; return;
} }
@ -322,12 +322,20 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
return; return;
} }
if ((u16)to_i > list_to->getSize()) { if (from_i < 0 || list_from->getSize() <= (u32) from_i) {
infostream << "IMoveAction::apply(): FAIL: destination index out of bounds: " infostream << "IMoveAction::apply(): FAIL: source index out of bounds: "
<< "to_i=" << to_i << "size of from_list=\"" << list_from->getSize() << "\""
<< ", size=" << list_to->getSize() << std::endl; << ", from_index=\"" << from_i << "\"" << std::endl;
return; return;
} }
if (to_i < 0 || list_to->getSize() <= (u32) to_i) {
infostream << "IMoveAction::apply(): FAIL: destination index out of bounds: "
<< "size of to_list=\"" << list_to->getSize() << "\""
<< ", to_index=\"" << to_i << "\"" << std::endl;
return;
}
/* /*
Do not handle rollback if both inventories are that of the same player Do not handle rollback if both inventories are that of the same player
*/ */