[libav-devel] [PATCH 1/3] avfilter: check malloc return values.

[Ronald S. Bultje]

---
 libavfilter/avfilter.c |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index c71c046..98fd2f7 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -583,18 +583,25 @@ int avfilter_open(AVFilterContext **filter_ctx, AVFilter 
*filter, const char *in
         return AVERROR(EINVAL);
 
     ret = av_mallocz(sizeof(AVFilterContext));
+    if (!ret)
+        return AVERROR(ENOMEM);
 
     ret->av_class = &avfilter_class;
     ret->filter   = filter;
     ret->name     = inst_name ? av_strdup(inst_name) : NULL;
-    if (filter->priv_size)
+    if (filter->priv_size) {
         ret->priv     = av_mallocz(filter->priv_size);
+        if (!ret->priv)
+            goto err;
+    }
 
     ret->input_count  = pad_count(filter->inputs);
     if (ret->input_count) {
         ret->input_pads   = av_malloc(sizeof(AVFilterPad) * ret->input_count);
         memcpy(ret->input_pads, filter->inputs, sizeof(AVFilterPad) * 
ret->input_count);
         ret->inputs       = av_mallocz(sizeof(AVFilterLink*) * 
ret->input_count);
+        if (!ret->inputs || !ret->input_pads)
+            goto err;
     }
 
     ret->output_count = pad_count(filter->outputs);
@@ -602,10 +609,23 @@ int avfilter_open(AVFilterContext **filter_ctx, AVFilter 
*filter, const char *in
         ret->output_pads  = av_malloc(sizeof(AVFilterPad) * ret->output_count);
         memcpy(ret->output_pads, filter->outputs, sizeof(AVFilterPad) * 
ret->output_count);
         ret->outputs      = av_mallocz(sizeof(AVFilterLink*) * 
ret->output_count);
+        if (!ret->outputs || !ret->output_pads)
+            goto err;
     }
 
     *filter_ctx = ret;
     return 0;
+
+err:
+    av_freep(&ret->inputs);
+    av_freep(&ret->input_pads);
+    ret->input_count = 0;
+    av_freep(&ret->outputs);
+    av_freep(&ret->output_pads);
+    ret->output_count = 0;
+    av_freep(&ret->priv);
+    av_free(ret);
+    return AVERROR(ENOMEM);
 }
 
 void avfilter_free(AVFilterContext *filter)
-- 
1.7.2.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel