From 336bb3f706ea86239f2bb1cadff3a7c40f95d130 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 27 Dec 2014 15:48:32 +0100 Subject: [PATCH] avutil/dict: Use av_freep() to avoid leaving stale pointers in memory Signed-off-by: Michael Niedermayer --- libavutil/dict.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavutil/dict.c b/libavutil/dict.c index a362de07d7..0d54c7970a 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -120,7 +120,7 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, m->count++; } if (!m->count) { - av_free(m->elems); + av_freep(&m->elems); av_freep(pm); } @@ -128,7 +128,7 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, err_out: if (m && !m->count) { - av_free(m->elems); + av_freep(&m->elems); av_freep(pm); } if (flags & AV_DICT_DONT_STRDUP_KEY) av_free((void*)key); @@ -197,10 +197,10 @@ void av_dict_free(AVDictionary **pm) if (m) { while (m->count--) { - av_free(m->elems[m->count].key); - av_free(m->elems[m->count].value); + av_freep(&m->elems[m->count].key); + av_freep(&m->elems[m->count].value); } - av_free(m->elems); + av_freep(&m->elems); } av_freep(pm); }