qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-21 11:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ui] Fix use of an uninitialized pointer

Browse source 
I had forgotten that Hash_NewTable checked the hashctx parameter, so
calling Hash_NewTable in the struct initializer meant the hasctx was
uninitialized.
This commit is contained in:
Bill Currie 2023-07-03 16:35:51 +09:00
parent 6d823cca84
commit 76b110bf0b
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libs/ui/imui.c
View file

@ -155,11 +155,11 @@ IMUI_NewContext (canvas_system_t canvas_sys, const char *font, float fontsize)
.vsys = { canvas_sys.reg, canvas_sys.view_base },
.tsys = { canvas_sys.reg, canvas_sys.view_base, canvas_sys.text_base },
.root_view = Canvas_GetRootView (canvas_sys, canvas),
.tab = Hash_NewTable (511, imui_state_getkey, 0, ctx, &ctx->hashctx),
.hot = nullent,
.active = nullent,
.mouse_position = {-1, -1},
};
ctx->tab = Hash_NewTable (511, imui_state_getkey, 0, ctx, &ctx->hashctx);
auto fpath = Font_SystemFont (font);
if (fpath) {
@ -229,9 +229,6 @@ IMUI_BeginFrame (imui_ctx_t *ctx)
{
uint32_t root_ent = ctx->root_view.id;
Ent_RemoveComponent (root_ent, ctx->root_view.comp, ctx->root_view.reg);
if (!ECS_EntValid (root_ent, ctx->vsys.reg)) {
Sys_Error ("root got deleted");
}
ctx->root_view = View_AddToEntity (root_ent, ctx->vsys, nullview);
ctx->frame_start = Sys_LongTime ();
ctx->frame_count++;