diff options
author | Vito Caputo <vcaputo@pengaru.com> | 2023-07-17 16:59:15 -0700 |
---|---|---|
committer | Vito Caputo <vcaputo@pengaru.com> | 2023-07-17 16:59:15 -0700 |
commit | b249494bd62713a5a2fcb1cd4180e5001643f2ac (patch) | |
tree | e17d1df0c7cde99ac62441a938a4ba306cdc9920 | |
parent | eb0a0bac1f8a78e5164aa07c2e0157d34733cec8 (diff) |
main: fix UAF bug on shutdown
When introducing the **fragment_ptr model in 5a0776f, the
rototiller_thread() introduced a local place to put the pointer
to point at when rendering.
But this pointer then ends up outliving the thread on shutdown
within any queued frames until quiescent. Fixed in the obvious
way by sticking it in rototiller_t instead.
-rw-r--r-- | src/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -55,6 +55,7 @@ typedef struct rototiller_t { const til_module_t *module; til_module_context_t *module_context; til_stream_t *stream; + til_fb_fragment_t *fragment; pthread_t thread; til_fb_t *fb; struct timeval start_tv; @@ -334,14 +335,13 @@ static void * rototiller_thread(void *_rt) struct timeval now; for (;;) { - til_fb_fragment_t *fragment; unsigned ticks; - fragment = til_fb_page_get(rt->fb); + rt->fragment = til_fb_page_get(rt->fb); gettimeofday(&now, NULL); ticks = get_ticks(&rt->start_tv, &now, rt->ticks_offset); - til_module_render(rt->module_context, rt->stream, ticks, &fragment); - til_fb_fragment_submit(fragment); + til_module_render(rt->module_context, rt->stream, ticks, &rt->fragment); + til_fb_fragment_submit(rt->fragment); if (rt->args.print_module_contexts || rt->args.print_pipes) { /* render threads are idle at this point */ |