system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-07-21 02:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pipewire: utils: pw_strv_parse(): fix freeing in case of error

Browse source 
When iterating a pw_array of `T`, the iterator must be of type `T*`.
Otherwise the wrong pointer will be freed.

Fixes: 4a19a76dc1 ("utils: improve pw_strv_parse")
Reported-by: Coverity Scan <scan-admin@coverity.com>
This commit is contained in:
Barnabás Pőcze 2024-04-27 15:08:45 +02:00
parent 7f4a0ba8cb
commit fa97a5b77c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/pipewire/utils.c
View file

@ -131,7 +131,6 @@ char **pw_strv_parse(const char *val, size_t len, int max_tokens, int *n_tokens)
{
struct pw_array arr;
struct spa_json it[2];
char *s, **result;
int n = 0, l, res;
const char *value;
struct spa_error_location el;
@ -146,6 +145,8 @@ char **pw_strv_parse(const char *val, size_t len, int max_tokens, int *n_tokens)
spa_json_init(&it[1], val, len);
while ((l = spa_json_next(&it[1], &value)) > 0 && n + 1 < max_tokens) {
char *s;
if ((s = malloc(l+1)) == NULL)
goto error_errno;
@ -163,8 +164,10 @@ done:
if ((res = spa_json_get_error(&it[1], val, &el))) {
spa_debug_log_error_location(pw_log_get(), SPA_LOG_LEVEL_WARN,
&el, "error parsing strv: %s", el.reason);
char **s;
pw_array_for_each(s, &arr)
free(s);
free(*s);
pw_array_clear(&arr);
n = 0;
}