Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'

[ffmpeg] / libavutil / dict.c

diff --git a/libavutil/dict.c b/libavutil/dict.c
index 358958cdc5eb36607d51bb7896ae615d5c161bf2..aea89105412044b1ba5d0bf6cd5a055f1e730d25 100644 (file)
--- a/libavutil/dict.c
+++ b/libavutil/dict.c
@@ -90,10 +90,9 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
     } else {
         AVDictionaryEntry *tmp = av_realloc(m->elems,
                                             (m->count + 1) * sizeof(*m->elems));
-        if (tmp)
-            m->elems = tmp;
-        else
+        if (!tmp)
             return AVERROR(ENOMEM);
+        m->elems = tmp;
     }
     if (value) {
         if (flags & AV_DICT_DONT_STRDUP_KEY)