RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

m_options: fix obj settings list leak on error 

Fixes: b3b542af51
This commit is contained in:
Kacper Michajłow 2024-06-22 01:21:18 +02:00
parent 265056fa54
commit 758019bf92
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
options/m_option.c
View File

@ -3435,6 +3435,7 @@ static int parse_obj_settings_list(struct mp_log *log, const m_option_t *opt,
}; };
if (!obj_settings_list_insert_at(log, &res, -1, &item)) { if (!obj_settings_list_insert_at(log, &res, -1, &item)) {
obj_setting_free(&item); obj_setting_free(&item);
free_obj_settings_list(&res);
ret = M_OPT_OUT_OF_RANGE; ret = M_OPT_OUT_OF_RANGE;
goto done; goto done;
} }
@ -3464,6 +3465,7 @@ static int parse_obj_settings_list(struct mp_log *log, const m_option_t *opt,
if (label < 0) { if (label < 0) {
if (!obj_settings_list_insert_at(log, &list, prepend_counter, &res[n])) { if (!obj_settings_list_insert_at(log, &list, prepend_counter, &res[n])) {
obj_setting_free(&res[n]); obj_setting_free(&res[n]);
free_obj_settings_list(&res);
ret = M_OPT_OUT_OF_RANGE; ret = M_OPT_OUT_OF_RANGE;
goto done; goto done;
} }
@ -3482,6 +3484,7 @@ static int parse_obj_settings_list(struct mp_log *log, const m_option_t *opt,
if (label < 0) { if (label < 0) {
if (!obj_settings_list_insert_at(log, &list, -1, &res[n])) { if (!obj_settings_list_insert_at(log, &list, -1, &res[n])) {
obj_setting_free(&res[n]); obj_setting_free(&res[n]);
free_obj_settings_list(&res);
ret = M_OPT_OUT_OF_RANGE; ret = M_OPT_OUT_OF_RANGE;
goto done; goto done;
} }
@ -3511,6 +3514,7 @@ static int parse_obj_settings_list(struct mp_log *log, const m_option_t *opt,
if (found < 0) { if (found < 0) {
if (!obj_settings_list_insert_at(log, &list, -1, &res[n])) { if (!obj_settings_list_insert_at(log, &list, -1, &res[n])) {
obj_setting_free(&res[n]); obj_setting_free(&res[n]);
free_obj_settings_list(&res);
ret = M_OPT_OUT_OF_RANGE; ret = M_OPT_OUT_OF_RANGE;
goto done; goto done;
} }