diff mbox series

[FFmpeg-devel,4/4] lavc/decode: validate frames output by decoders

Message ID 20230105110756.473-4-anton@khirnov.net
State Accepted
Commit f566032bfda2fee4fb6388d5906d1957a1ed868a
Headers show
Series [FFmpeg-devel,1/4] lavc/ac3dec: fail when the sample rate is unset | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov Jan. 5, 2023, 11:07 a.m. UTC 
Make sure no frames with invalid parameters will be seen by the caller.
---
 libavcodec/decode.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

Comments

Paul B Mahol Jan. 5, 2023, 11:15 a.m. UTC | #1 
LGTM
diff mbox series

Patch

diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 56ba06d5d5..0abc88737b 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -667,6 +667,33 @@  static int apply_cropping(AVCodecContext *avctx, AVFrame *frame)
                                           AV_FRAME_CROP_UNALIGNED : 0);
 }
 
+// make sure frames returned to the caller are valid
+static int frame_validate(AVCodecContext *avctx, AVFrame *frame)
+{
+    if (!frame->buf[0] || frame->format < 0)
+        goto fail;
+
+    switch (avctx->codec_type) {
+    case AVMEDIA_TYPE_VIDEO:
+        if (frame->width <= 0 || frame->height <= 0)
+            goto fail;
+        break;
+    case AVMEDIA_TYPE_AUDIO:
+        if (!av_channel_layout_check(&frame->ch_layout) ||
+            frame->sample_rate <= 0)
+            goto fail;
+
+        break;
+    default: av_assert0(0);
+    }
+
+    return 0;
+fail:
+    av_log(avctx, AV_LOG_ERROR, "An invalid frame was output by a decoder. "
+           "This is a bug, please report it.\n");
+    return AVERROR_BUG;
+}
+
 int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
 {
     AVCodecInternal *avci = avctx->internal;
@@ -683,6 +710,10 @@  int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
             return ret;
     }
 
+    ret = frame_validate(avctx, frame);
+    if (ret < 0)
+        goto fail;
+
     if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
         ret = apply_cropping(avctx, frame);
         if (ret < 0)