From: Paul B Mahol <onemda@gmail.com>
Date: Tue, 1 Oct 2019 11:45:29 +0000 (+0200)
Subject: avfilter/vf_copy: check for error cases and handle them
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a9500441a71805da13389d4a56188c90f6bc013e;p=ffmpeg

avfilter/vf_copy: check for error cases and handle them
---

diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c
index b0159cff00e..a59e024e87c 100644
--- a/libavfilter/vf_copy.c
+++ b/libavfilter/vf_copy.c
@@ -48,15 +48,23 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
     AVFilterLink *outlink = inlink->dst->outputs[0];
     AVFrame *out = ff_get_video_buffer(outlink, in->width, in->height);
+    int ret;
 
-    if (!out) {
-        av_frame_free(&in);
-        return AVERROR(ENOMEM);
-    }
-    av_frame_copy_props(out, in);
-    av_frame_copy(out, in);
+    if (!out)
+        ret = AVERROR(ENOMEM);
+
+    ret = av_frame_copy_props(out, in);
+    if (ret < 0)
+        goto fail;
+    ret = av_frame_copy(out, in);
+    if (ret < 0)
+        goto fail;
     av_frame_free(&in);
     return ff_filter_frame(outlink, out);
+fail:
+    av_frame_free(&in);
+    av_frame_free(&out);
+    return ret;
 }
 
 static const AVFilterPad avfilter_vf_copy_inputs[] = {