From bddc592001bd041511f4086a7d15611ec695e606 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Tue, 29 Jul 2014 21:23:57 +0200 Subject: dict.c: empty dictionaries should be a NULL pointer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ensure this is even the case if they are empty because we failed adding the first entry. Signed-off-by: Reimar Döffinger --- libavutil/dict.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libavutil/dict.c') diff --git a/libavutil/dict.c b/libavutil/dict.c index 9fdc6d6273..c17ce7a3cb 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -91,7 +91,7 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, AVDictionaryEntry *tmp = av_realloc(m->elems, (m->count + 1) * sizeof(*m->elems)); if (!tmp) - return AVERROR(ENOMEM); + goto err_out; m->elems = tmp; } if (value) { @@ -105,7 +105,7 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, int len = strlen(oldval) + strlen(value) + 1; char *newval = av_mallocz(len); if (!newval) - return AVERROR(ENOMEM); + goto err_out; av_strlcat(newval, oldval, len); av_freep(&oldval); av_strlcat(newval, value, len); @@ -120,6 +120,13 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, } return 0; + +err_out: + if (!m->count) { + av_free(m->elems); + av_freep(pm); + } + return AVERROR(ENOMEM); } int av_dict_set_int(AVDictionary **pm, const char *key, int64_t value, -- cgit v1.2.3