har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/dict: Deduplicate freeing dictionary

Browse Source 
Reviewed-by: epirat07@gmail.com
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-03-05 16:34:07 +01:00
parent 6cf904ac3d
commit dfffe03755
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/dict.c
View File

@ -145,11 +145,8 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
m->elems[m->count].value = copy_value; m->elems[m->count].value = copy_value;
m->count++; m->count++;
} else { } else {
if (!m->count) { err = 0;
av_freep(&m->elems); goto end;
av_freep(pm);
}
av_freep(&copy_key);
} }
return 0; return 0;
@ -157,12 +154,13 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
enomem: enomem:
err = AVERROR(ENOMEM); err = AVERROR(ENOMEM);
err_out: err_out:
av_free(copy_value);
end:
if (m && !m->count) { if (m && !m->count) {
av_freep(&m->elems); av_freep(&m->elems);
av_freep(pm); av_freep(pm);
} }
av_free(copy_key); av_free(copy_key);
av_free(copy_value);
return err; return err;
} }