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/rtv/rtv.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/rtv/rtv.c')
| -rw-r--r-- | src/modules/rtv/rtv.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/modules/rtv/rtv.c b/src/modules/rtv/rtv.c index 06dfd90..08f4b8a 100644 --- a/src/modules/rtv/rtv.c +++ b/src/modules/rtv/rtv.c @@ -409,8 +409,11 @@ static int rtv_setup(const til_settings_t *settings, til_setting_t **res_setting til_get_modules(&modules, &n_modules); tokchannels = strdup(channels); - if (!tokchannels) + if (!tokchannels) { + til_setup_free(&setup->til_setup); + return -ENOMEM; + } channel = strtok(tokchannels, ":"); do { @@ -422,12 +425,16 @@ static int rtv_setup(const til_settings_t *settings, til_setting_t **res_setting 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->channels[0])); if (!new) { - free(setup); + til_setup_free(&setup->til_setup); + return -ENOMEM; } |