diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2014-07-29 21:16:35 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2014-08-23 15:28:48 +0200 |
| commit | 8fc9bd0d32f0ef806adddfb7dfc56c538c85f4d4 (patch) | |
| tree | a8e2d6ad6502dfb2390df9a4f8c184f2fc27ca6c /libavutil/dict.c | |
| parent | 45c7f3997ea11c3d1007b2126b1c0049a8c27105 (diff) | |
| download | ffmpeg-8fc9bd0d32f0ef806adddfb7dfc56c538c85f4d4.tar.gz | |
dict.c: Free non-strduped av_dict_set arguments on error.
Unfortunately this was not explicitly documented and thus
might be risky.
But all uses I could find in FFmpeg and one in VLC had a memleak
in these cases, and I could not find any that relied on the previous
behaviour.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavutil/dict.c')
| -rw-r--r-- | libavutil/dict.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/dict.c b/libavutil/dict.c index c17ce7a3cb..bdb56908d3 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -126,6 +126,8 @@ err_out: av_free(m->elems); av_freep(pm); } + if (flags & AV_DICT_DONT_STRDUP_KEY) av_free(key); + if (flags & AV_DICT_DONT_STRDUP_VAL) av_free(value); return AVERROR(ENOMEM); } |