qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ecs] Make Ent_HasComponent more robust

Browse source 
It doesn't check that the entity itself is valid, but it does at least
check that the index fetched from the sparse array is valid. Fixes a
segfault when a valid entity never had the component.
This commit is contained in:
Bill Currie 2022-10-31 13:06:55 +09:00
parent 7c06012383
commit 962319af09
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/QF/ecs/component.h
View file

@ -198,8 +198,9 @@ ECS_EntValid (uint32_t id, ecs_registry_t *reg)
COMPINLINE int COMPINLINE int
Ent_HasComponent (uint32_t ent, uint32_t comp, ecs_registry_t *reg) Ent_HasComponent (uint32_t ent, uint32_t comp, ecs_registry_t *reg)
{ {
uint32_t ind = reg->comp_pools[comp].sparse[Ent_Index (ent)]; ecs_pool_t *pool = &reg->comp_pools[comp];
return reg->comp_pools[comp].dense[ind] == ent; uint32_t ind = pool->sparse[Ent_Index (ent)];
return ind < pool->count && pool->dense[ind] == ent;
} }
COMPINLINE void * COMPINLINE void *