diff options
author | Vito Caputo <vcaputo@pengaru.com> | 2022-04-24 21:16:37 -0700 |
---|---|---|
committer | Vito Caputo <vcaputo@pengaru.com> | 2022-04-24 21:16:37 -0700 |
commit | 3427eefac9cf38ac3fa2635c69bb3f0693700cf8 (patch) | |
tree | b078abaf3bb0841b89df3e26319035ff01cd0604 /src/modules/compose/compose.c | |
parent | 2bcc2ca1ed6b7e1fa075770bcb306a3fdff917af (diff) |
*: free setup allocations via til_setup_free()
This should plug a bulk of the setup leaks. Some of the
free_funcs still need to be changed to bespoke ones in modules
that allocate nested things in their respective setup, so those
are still leaking the nested things which are usually just a
small strdup of some kind.
Diffstat (limited to 'src/modules/compose/compose.c')
-rw-r--r-- | src/modules/compose/compose.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/modules/compose/compose.c b/src/modules/compose/compose.c index 0fa1204..110bb63 100644 --- a/src/modules/compose/compose.c +++ b/src/modules/compose/compose.c @@ -87,8 +87,7 @@ static void * compose_create_context(unsigned ticks, unsigned num_cpus, til_setu ctxt->layers[i].module = layer_module; (void) til_module_create_context(layer_module, ticks, layer_setup, &ctxt->layers[i].module_ctxt); - - /* TODO FIXME: free setup! */ + til_setup_free(layer_setup); ctxt->n_layers++; } @@ -167,20 +166,29 @@ static int compose_setup(const til_settings_t *settings, til_setting_t **res_set * going to let the user potentially compose with montage * or rtv as one of the layers. */ - if (!strcmp(layer, "compose")) /* XXX: prevent infinite recursion */ + if (!strcmp(layer, "compose")) { /* XXX: prevent infinite recursion */ + til_setup_free(&setup->til_setup); + return -EINVAL; + } for (i = 0; i < n_modules; i++) { if (!strcmp(layer, modules[i]->name)) break; } - if (i >= n_modules) + if (i >= n_modules) { + til_setup_free(&setup->til_setup); + return -EINVAL; + } new = realloc(setup, sizeof(*setup) + n * sizeof(*setup->layers)); - if (!new) + if (!new) { + til_setup_free(&setup->til_setup); + return -ENOMEM; + } new->layers[n - 2] = layer; new->layers[n - 1] = NULL; |