Merge commit '1619274fb393f55a365cc10f88faa173c9a8e772'

* commit '1619274fb393f55a365cc10f88faa173c9a8e772': av_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITE Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 375fa06125
parent 383d8ddf29 1619274fb3
commit 375fa06125
1 changed files with 4 additions and 1 deletions
--- a/libavutil/dict.c
+++ b/libavutil/dict.c
@ -76,8 +76,11 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
        m = *pm = av_mallocz(sizeof(*m));

    if (tag) {
-        if (flags & AV_DICT_DONT_OVERWRITE)
+        if (flags & AV_DICT_DONT_OVERWRITE) {
+            if (flags & AV_DICT_DONT_STRDUP_KEY) av_free(key);
+            if (flags & AV_DICT_DONT_STRDUP_VAL) av_free(value);
            return 0;
+        }
        if (flags & AV_DICT_APPEND)
            oldval = tag->value;
        else