TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use check_untrusted on boss robot messages

Browse source
This commit is contained in:
Kp 2019-04-28 00:53:40 +00:00
parent 3e25804026
commit fb6323ed42
2 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/include/valptridx.h
View file

@ -781,6 +781,7 @@ class valptridx<managed_type>::guarded
};
mutable state m_state;
public:
__attribute_cold
guarded(std::nullptr_t) :
m_dummy(), m_state(empty)
{
@ -798,7 +799,7 @@ public:
* return true. operator*() uses m_state to enforce that the
* result is tested.
*/
if (m_state == empty)
if (unlikely(m_state == empty))
return false;
m_state = checked;
return true;

39
similar/main/multibot.cpp
View file

@ -1055,17 +1055,22 @@ void multi_do_boss_teleport(const d_vclip_array &Vclip, const playernum_t pnum,
auto &Objects = LevelUniqueObjectState.Objects;
auto &vcobjptr = Objects.vcptr;
auto &vmobjptr = Objects.vmptr;
auto &vmobjptridx = Objects.vmptridx;
auto &Robot_info = LevelSharedRobotInfoState.Robot_info;
boss_teleport b;
multi_serialize_read(buf, b);
const vmobjptridx_t boss_obj = vmobjptridx(b.objnum);
const auto &&guarded_boss_obj = Objects.vmptridx.check_untrusted(b.objnum);
if (!guarded_boss_obj)
return;
const auto &&boss_obj = *guarded_boss_obj;
if ((boss_obj->type != OBJ_ROBOT) || !(Robot_info[get_robot_id(boss_obj)].boss_flag))
{
Int3(); // Got boss actions for a robot who's not a boss?
return;
}
const auto &&teleport_segnum = vmsegptridx(b.where);
const auto &&guarded_teleport_segnum = vmsegptridx.check_untrusted(b.where);
if (!guarded_teleport_segnum)
return;
const auto &&teleport_segnum = *guarded_teleport_segnum;
auto &Vertices = LevelSharedVertexState.get_vertices();
auto &vcvertptr = Vertices.vcptr;
compute_segment_center(vcvertptr, boss_obj->pos, teleport_segnum);
@ -1097,8 +1102,11 @@ void multi_do_boss_cloak(const ubyte *buf)
auto &Robot_info = LevelSharedRobotInfoState.Robot_info;
boss_cloak b;
multi_serialize_read(buf, b);
const vmobjptridx_t boss_obj = vmobjptridx(b.objnum);
if ((boss_obj->type != OBJ_ROBOT) || !(Robot_info[get_robot_id(boss_obj)].boss_flag))
const auto &&guarded_boss_obj = vmobjptridx.check_untrusted(b.objnum);
if (!guarded_boss_obj)
return;
const auto &&boss_obj = *guarded_boss_obj;
if (boss_obj->type != OBJ_ROBOT || !Robot_info[get_robot_id(boss_obj)].boss_flag)
{
Int3(); // Got boss actions for a robot who's not a boss?
return;
@ -1119,8 +1127,11 @@ void multi_do_boss_start_gate(const ubyte *buf)
auto &Robot_info = LevelSharedRobotInfoState.Robot_info;
boss_start_gate b;
multi_serialize_read(buf, b);
const vmobjptridx_t boss_obj = vmobjptridx(b.objnum);
if ((boss_obj->type != OBJ_ROBOT) || !(Robot_info[get_robot_id(boss_obj)].boss_flag))
const auto &&guarded_boss_obj = vmobjptridx.check_untrusted(b.objnum);
if (!guarded_boss_obj)
return;
const object_base &boss_obj = *guarded_boss_obj;
if (boss_obj.type != OBJ_ROBOT || !Robot_info[get_robot_id(boss_obj)].boss_flag)
{
Int3(); // Got boss actions for a robot who's not a boss?
return;
@ -1135,8 +1146,11 @@ void multi_do_boss_stop_gate(const ubyte *buf)
auto &Robot_info = LevelSharedRobotInfoState.Robot_info;
boss_start_gate b;
multi_serialize_read(buf, b);
const vmobjptridx_t boss_obj = vmobjptridx(b.objnum);
if ((boss_obj->type != OBJ_ROBOT) || !(Robot_info[get_robot_id(boss_obj)].boss_flag))
const auto &&guarded_boss_obj = vmobjptridx.check_untrusted(b.objnum);
if (!guarded_boss_obj)
return;
const object_base &boss_obj = *guarded_boss_obj;
if (boss_obj.type != OBJ_ROBOT || !Robot_info[get_robot_id(boss_obj)].boss_flag)
{
Int3(); // Got boss actions for a robot who's not a boss?
return;
@ -1151,8 +1165,11 @@ void multi_do_boss_create_robot(const playernum_t pnum, const ubyte *buf)
auto &Robot_info = LevelSharedRobotInfoState.Robot_info;
boss_create_robot b;
multi_serialize_read(buf, b);
const vmobjptridx_t boss_obj = vmobjptridx(b.objnum);
if ((boss_obj->type != OBJ_ROBOT) || !(Robot_info[get_robot_id(boss_obj)].boss_flag))
const auto &&guarded_boss_obj = vmobjptridx.check_untrusted(b.objnum);
if (!guarded_boss_obj)
return;
const object_base &boss_obj = *guarded_boss_obj;
if (boss_obj.type != OBJ_ROBOT || !Robot_info[get_robot_id(boss_obj)].boss_flag)
{
Int3(); // Got boss actions for a robot who's not a boss?
return;