lavfi: always check return value of ff_get_{audio,video}_buffer()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c
index c05e5719a325f2fa6c7ed21ba991e9630fe32c8a..1fc06f208592a36a18a8c563368e5c2a73dbd4ad 100644 (file)
--- a/libavfilter/af_aconvert.c
+++ b/libavfilter/af_aconvert.c
@@ -143,6 +143,8 @@ static int  filter_frame(AVFilterLink *inlink, AVFrame *insamplesref)
     AVFrame *outsamplesref = ff_get_audio_buffer(outlink, n);
     int ret;
 
+    if (!outsamplesref)
+        return AVERROR(ENOMEM);
     swr_convert(aconvert->swr, outsamplesref->extended_data, n,
                         (void *)insamplesref->extended_data, n);
 

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 6e83aeb0760bf56cdea84f9e0c2410ca974799f1..e9a7fc91af4891d8e909f319826a1dad668affd9 100644 (file)
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -248,6 +248,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
         return 0;
 
     outbuf = ff_get_audio_buffer(ctx->outputs[0], nb_samples);
+    if (!outbuf)
+        return AVERROR(ENOMEM);
     outs = outbuf->data[0];
     for (i = 0; i < am->nb_inputs; i++) {
         inbuf[i] = ff_bufqueue_peek(&am->in[i].queue, 0);

diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index 9a10baae09de1fb7e2136a3725e1eb7045d89e13..6ecf5cb18e3f28d500ea705bf049972f31589c2d 100644 (file)
--- a/libavfilter/af_asetnsamples.c
+++ b/libavfilter/af_asetnsamples.c
@@ -108,7 +108,8 @@ static int push_samples(AVFilterLink *outlink)
         return 0;
 
     outsamples = ff_get_audio_buffer(outlink, nb_out_samples);
-    av_assert0(outsamples);
+    if (!outsamples)
+        return AVERROR(ENOMEM);
 
     av_audio_fifo_read(asns->fifo,
                        (void **)outsamples->extended_data, nb_out_samples);

diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c
index af49b0b771d694567f7869bccce0ae41c8d01f8a..6fe8b2c9270e1ce39baf2afa36b2fcd7f5432f9f 100644 (file)
--- a/libavfilter/af_atempo.c
+++ b/libavfilter/af_atempo.c
@@ -1062,6 +1062,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *src_buffer)
     while (src < src_end) {
         if (!atempo->dst_buffer) {
             atempo->dst_buffer = ff_get_audio_buffer(outlink, n_out);
+            if (!atempo->dst_buffer)
+                return AVERROR(ENOMEM);
             av_frame_copy_props(atempo->dst_buffer, src_buffer);
 
             atempo->dst = atempo->dst_buffer->data[0];
@@ -1100,6 +1102,8 @@ static int request_frame(AVFilterLink *outlink)
         while (err == AVERROR(EAGAIN)) {
             if (!atempo->dst_buffer) {
                 atempo->dst_buffer = ff_get_audio_buffer(outlink, n_max);
+                if (!atempo->dst_buffer)
+                    return AVERROR(ENOMEM);
 
                 atempo->dst = atempo->dst_buffer->data[0];
                 atempo->dst_end = atempo->dst + n_max * atempo->stride;

diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index ae2e0aa4810d5160071250aff92d6f112f4c68fe..038a8a1157e5dddb53dbfd264e73e54e4d9a4c4f 100644 (file)
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -361,6 +361,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
     AVFrame *outsamples = ff_get_audio_buffer(outlink, n);
     PanContext *pan = inlink->dst->priv;
 
+    if (!outsamples)
+        return AVERROR(ENOMEM);
     swr_convert(pan->swr, outsamples->data, n, (void *)insamples->data, n);
     av_frame_copy_props(outsamples, insamples);
     outsamples->channel_layout = outlink->channel_layout;

diff --git a/libavfilter/asrc_aevalsrc.c b/libavfilter/asrc_aevalsrc.c
index 409399f3a43f9d98c04316bf46307b7fea58041b..0dbfdd2703b4707aad5b8acc347f9bf2f42cfcb6 100644 (file)
--- a/libavfilter/asrc_aevalsrc.c
+++ b/libavfilter/asrc_aevalsrc.c
@@ -220,6 +220,8 @@ static int request_frame(AVFilterLink *outlink)
         return AVERROR_EOF;
 
     samplesref = ff_get_audio_buffer(outlink, eval->nb_samples);
+    if (!samplesref)
+        return AVERROR(ENOMEM);
 
     /* evaluate expression for each single sample and for each channel */
     for (i = 0; i < eval->nb_samples; i++, eval->n++) {

diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c
index 5caca2f2c93a8c23fe79b17e5b36cf73293399f3..6ff2140bbeed8853c26b0a47859b889861e8ffe3 100644 (file)
--- a/libavfilter/vf_tinterlace.c
+++ b/libavfilter/vf_tinterlace.c
@@ -266,6 +266,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
     case MODE_PAD: /* expand each frame to double height, but pad alternate
                     * lines with black; framerate unchanged */
         out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
+        if (!out)
+            return AVERROR(ENOMEM);
         av_frame_copy_props(out, cur);
         out->height = outlink->h;
 

diff --git a/libavfilter/vsrc_cellauto.c b/libavfilter/vsrc_cellauto.c
index 110f6aed95fc14aeda2637369b8c7c2cd41c110b..a48f04c3e1ea867892768fe11451effa56bec8fb 100644 (file)
--- a/libavfilter/vsrc_cellauto.c
+++ b/libavfilter/vsrc_cellauto.c
@@ -294,6 +294,8 @@ static int request_frame(AVFilterLink *outlink)
 {
     CellAutoContext *cellauto = outlink->src->priv;
     AVFrame *picref = ff_get_video_buffer(outlink, cellauto->w, cellauto->h);
+    if (!picref)
+        return AVERROR(ENOMEM);
     picref->sample_aspect_ratio = (AVRational) {1, 1};
     if (cellauto->generation == 0 && cellauto->start_full) {
         int i;

diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c
index 0474ef26b0e7f6895693e7b80daf9a970b6457d6..d7ed40bf53f355abcb1964d47b46535f4844edd1 100644 (file)
--- a/libavfilter/vsrc_life.c
+++ b/libavfilter/vsrc_life.c
@@ -420,6 +420,8 @@ static int request_frame(AVFilterLink *outlink)
 {
     LifeContext *life = outlink->src->priv;
     AVFrame *picref = ff_get_video_buffer(outlink, life->w, life->h);
+    if (!picref)
+        return AVERROR(ENOMEM);
     picref->sample_aspect_ratio = (AVRational) {1, 1};
     picref->pts = life->pts++;
 

diff --git a/libavfilter/vsrc_mandelbrot.c b/libavfilter/vsrc_mandelbrot.c
index 7bbdf958b897e60a7ae96f50d4fdb5b63ef4ee86..c91494b11da4cb625cc089c48a37b92829593445 100644 (file)
--- a/libavfilter/vsrc_mandelbrot.c
+++ b/libavfilter/vsrc_mandelbrot.c
@@ -403,6 +403,9 @@ static int request_frame(AVFilterLink *link)
 {
     MBContext *mb = link->src->priv;
     AVFrame *picref = ff_get_video_buffer(link, mb->w, mb->h);
+    if (!picref)
+        return AVERROR(ENOMEM);
+
     picref->sample_aspect_ratio = (AVRational) {1, 1};
     picref->pts = mb->pts++;
 

diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c
index 856c3e4decb58a21ad4a4ba0341ec402601070bc..9f1c46f8491d6f946ae12f7e69a1a4941178f92f 100644 (file)
--- a/libavfilter/vsrc_mptestsrc.c
+++ b/libavfilter/vsrc_mptestsrc.c
@@ -323,6 +323,8 @@ static int request_frame(AVFilterLink *outlink)
     if (test->max_pts >= 0 && test->pts > test->max_pts)
         return AVERROR_EOF;
     picref = ff_get_video_buffer(outlink, w, h);
+    if (!picref)
+        return AVERROR(ENOMEM);
     picref->pts = test->pts++;
 
     // clean image