Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'

[ffmpeg] / libavfilter / buffer.c

diff --git a/libavfilter/buffer.c b/libavfilter/buffer.c
index 43dc66911aeea9c28667ce888cba4dbd869db676..a5b3b1dbafc3fe8be62461984ac64bbb1a51b56b 100644 (file)
--- a/libavfilter/buffer.c
+++ b/libavfilter/buffer.c
@@ -42,13 +42,19 @@ void ff_avfilter_default_free_buffer(AVFilterBuffer *ptr)
     av_free(ptr);
 }
 
-static void copy_video_props(AVFilterBufferRefVideoProps *dst, AVFilterBufferRefVideoProps *src) {
+static int copy_video_props(AVFilterBufferRefVideoProps *dst, AVFilterBufferRefVideoProps *src) {
     *dst = *src;
     if (src->qp_table) {
         int qsize = src->qp_table_size;
         dst->qp_table = av_malloc(qsize);
+        if (!dst->qp_table) {
+            av_log(NULL, AV_LOG_ERROR, "Failed to allocate qp_table\n");
+            dst->qp_table_size = 0;
+            return AVERROR(ENOMEM);
+        }
         memcpy(dst->qp_table, src->qp_table, qsize);
     }
+    return 0;
 }
 
 AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask)