ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-11 16:18:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

guard against invalid ctrl entity handle resolutions when applying ctrl events; otherwise some edge cases can cause invalid writes.

Browse Source
This commit is contained in:
Ryan Fleury
2026-03-31 07:05:44 -07:00
parent 7021d6056a
commit d986ea6cd9
1 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ctrl/ctrl_core.c
+42 -30
View File
@@ -1270,9 +1270,12 @@ ctrl_entity_store_apply_events(CTRL_EntityCtxRWStore *store, CTRL_EventList *lis
case CTRL_EventKind_NewProc:
{
CTRL_Entity *machine = ctrl_entity_from_handle(&store->ctx, ctrl_handle_make(event->entity.machine_id, dmn_handle_zero()));
CTRL_Entity *process = ctrl_entity_alloc(store, machine, CTRL_EntityKind_Process, event->arch, event->entity, (U64)event->entity_id);
process->tls_model = event->tls_model;
process->target_os = event->target_os;
if(machine != &ctrl_entity_nil)
{
CTRL_Entity *process = ctrl_entity_alloc(store, machine, CTRL_EntityKind_Process, event->arch, event->entity, (U64)event->entity_id);
process->tls_model = event->tls_model;
process->target_os = event->target_os;
}
}break;
case CTRL_EventKind_EndProc:
{
@@ -1294,35 +1297,38 @@ ctrl_entity_store_apply_events(CTRL_EntityCtxRWStore *store, CTRL_EventList *lis
case CTRL_EventKind_NewThread:
{
CTRL_Entity *process = ctrl_entity_from_handle(&store->ctx, event->parent);
CTRL_Entity *thread = ctrl_entity_alloc(store, process, CTRL_EntityKind_Thread, event->arch, event->entity, (U64)event->entity_id);
CTRL_Entity *first_thread = ctrl_entity_child_from_kind(process, CTRL_EntityKind_Thread);
if(first_thread == thread)
if(process != &ctrl_entity_nil)
{
ctrl_entity_equip_string(store, thread, str8_lit("main_thread"));
}
CTRL_EntityArray pending_thread_names = ctrl_entity_array_from_kind(&store->ctx, CTRL_EntityKind_PendingThreadName);
for EachIndex(idx, pending_thread_names.count)
{
CTRL_Entity *entity = pending_thread_names.v[idx];
if(entity->id == event->entity_id)
CTRL_Entity *thread = ctrl_entity_alloc(store, process, CTRL_EntityKind_Thread, event->arch, event->entity, (U64)event->entity_id);
CTRL_Entity *first_thread = ctrl_entity_child_from_kind(process, CTRL_EntityKind_Thread);
if(first_thread == thread)
{
ctrl_entity_equip_string(store, thread, entity->string);
ctrl_entity_release(store, entity);
break;
ctrl_entity_equip_string(store, thread, str8_lit("main_thread"));
}
}
CTRL_EntityArray pending_thread_colors = ctrl_entity_array_from_kind(&store->ctx, CTRL_EntityKind_PendingThreadColor);
for EachIndex(idx, pending_thread_colors.count)
{
CTRL_Entity *entity = pending_thread_colors.v[idx];
if(entity->id == event->entity_id)
CTRL_EntityArray pending_thread_names = ctrl_entity_array_from_kind(&store->ctx, CTRL_EntityKind_PendingThreadName);
for EachIndex(idx, pending_thread_names.count)
{
thread->rgba = entity->rgba;
ctrl_entity_release(store, entity);
break;
CTRL_Entity *entity = pending_thread_names.v[idx];
if(entity->id == event->entity_id)
{
ctrl_entity_equip_string(store, thread, entity->string);
ctrl_entity_release(store, entity);
break;
}
}
CTRL_EntityArray pending_thread_colors = ctrl_entity_array_from_kind(&store->ctx, CTRL_EntityKind_PendingThreadColor);
for EachIndex(idx, pending_thread_colors.count)
{
CTRL_Entity *entity = pending_thread_colors.v[idx];
if(entity->id == event->entity_id)
{
thread->rgba = entity->rgba;
ctrl_entity_release(store, entity);
break;
}
}
thread->stack_base = event->stack_base;
}
thread->stack_base = event->stack_base;
//ctrl_rip_from_thread(&store->ctx, event->entity);
}break;
case CTRL_EventKind_EndThread:
@@ -1346,7 +1352,7 @@ ctrl_entity_store_apply_events(CTRL_EntityCtxRWStore *store, CTRL_EventList *lis
{
ctrl_entity_equip_string(store, thread, event->string);
}
else
else if(process != &ctrl_entity_nil)
{
CTRL_Entity *pending_name = ctrl_entity_alloc(store, process, CTRL_EntityKind_PendingThreadName, Arch_Null, ctrl_handle_zero(), event->entity_id);
ctrl_entity_equip_string(store, pending_name, event->string);
@@ -1368,7 +1374,7 @@ ctrl_entity_store_apply_events(CTRL_EntityCtxRWStore *store, CTRL_EventList *lis
{
thread->rgba = event->rgba;
}
else
else if(process != &ctrl_entity_nil)
{
CTRL_Entity *pending = ctrl_entity_alloc(store, process, CTRL_EntityKind_PendingThreadColor, Arch_Null, ctrl_handle_zero(), event->entity_id);
pending->rgba = event->rgba;
@@ -1377,12 +1383,18 @@ ctrl_entity_store_apply_events(CTRL_EntityCtxRWStore *store, CTRL_EventList *lis
case CTRL_EventKind_ThreadFrozen:
{
CTRL_Entity *thread = ctrl_entity_from_handle(&store->ctx, event->entity);
thread->is_frozen = 1;
if(thread != &ctrl_entity_nil)
{
thread->is_frozen = 1;
}
}break;
case CTRL_EventKind_ThreadThawed:
{
CTRL_Entity *thread = ctrl_entity_from_handle(&store->ctx, event->entity);
thread->is_frozen = 0;
if(thread != &ctrl_entity_nil)
{
thread->is_frozen = 0;
}
}break;
//- rjf: modules