Merge commit '863ee8a855b8ce27ffef41479eb66da58763faed'

* commit '863ee8a855b8ce27ffef41479eb66da58763faed': lavfi: clean memory on error in ADD_FORMAT() Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 42f3cb419a
parent 15ed7ca437 863ee8a855
commit 42f3cb419a
1 changed files with 3 additions and 1 deletions
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@ -320,8 +320,10 @@ do {                                                        \
                                                            \
    fmts = av_realloc((*f)->list,                           \
                      sizeof(*(*f)->list) * ((*f)->nb + 1));\
-    if (!fmts)                                              \
+    if (!fmts) {                                            \
+        av_freep(&f);                                       \
        return AVERROR(ENOMEM);                             \
+    }                                                       \
                                                            \
    (*f)->list = fmts;                                      \
    (*f)->list[(*f)->nb++] = fmt;                           \