* [FFmpeg-devel] [PATCH 2/4] lavc/qsvdec: check ff_decode_frame_props() return value
2023-01-05 11:07 [FFmpeg-devel] [PATCH 1/4] lavc/ac3dec: fail when the sample rate is unset Anton Khirnov
@ 2023-01-05 11:07 ` Anton Khirnov
2023-01-06 1:34 ` Xiang, Haihao
2023-01-05 11:07 ` [FFmpeg-devel] [PATCH 3/4] lavc/decode: deduplicate cleanup in ff_decode_receive_frame() Anton Khirnov
2023-01-05 11:07 ` [FFmpeg-devel] [PATCH 4/4] lavc/decode: validate frames output by decoders Anton Khirnov
2 siblings, 1 reply; 6+ messages in thread
From: Anton Khirnov @ 2023-01-05 11:07 UTC (permalink / raw)
To: ffmpeg-devel
---
libavcodec/qsvdec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 92bfea196e..6bc85116ad 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -128,7 +128,9 @@ static int qsv_get_continuous_buffer(AVCodecContext *avctx, AVFrame *frame,
{
int ret = 0;
- ff_decode_frame_props(avctx, frame);
+ ret = ff_decode_frame_props(avctx, frame);
+ if (ret < 0)
+ return ret;
frame->width = avctx->width;
frame->height = avctx->height;
--
2.35.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [FFmpeg-devel] [PATCH 2/4] lavc/qsvdec: check ff_decode_frame_props() return value
2023-01-05 11:07 ` [FFmpeg-devel] [PATCH 2/4] lavc/qsvdec: check ff_decode_frame_props() return value Anton Khirnov
@ 2023-01-06 1:34 ` Xiang, Haihao
0 siblings, 0 replies; 6+ messages in thread
From: Xiang, Haihao @ 2023-01-06 1:34 UTC (permalink / raw)
To: ffmpeg-devel
On Do, 2023-01-05 at 12:07 +0100, Anton Khirnov wrote:
> ---
> libavcodec/qsvdec.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
> index 92bfea196e..6bc85116ad 100644
> --- a/libavcodec/qsvdec.c
> +++ b/libavcodec/qsvdec.c
> @@ -128,7 +128,9 @@ static int qsv_get_continuous_buffer(AVCodecContext
> *avctx, AVFrame *frame,
> {
> int ret = 0;
>
> - ff_decode_frame_props(avctx, frame);
> + ret = ff_decode_frame_props(avctx, frame);
> + if (ret < 0)
> + return ret;
>
> frame->width = avctx->width;
> frame->height = avctx->height;
LGTM, thx
-Haihao
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread
* [FFmpeg-devel] [PATCH 3/4] lavc/decode: deduplicate cleanup in ff_decode_receive_frame()
2023-01-05 11:07 [FFmpeg-devel] [PATCH 1/4] lavc/ac3dec: fail when the sample rate is unset Anton Khirnov
2023-01-05 11:07 ` [FFmpeg-devel] [PATCH 2/4] lavc/qsvdec: check ff_decode_frame_props() return value Anton Khirnov
@ 2023-01-05 11:07 ` Anton Khirnov
2023-01-05 11:07 ` [FFmpeg-devel] [PATCH 4/4] lavc/decode: validate frames output by decoders Anton Khirnov
2 siblings, 0 replies; 6+ messages in thread
From: Anton Khirnov @ 2023-01-05 11:07 UTC (permalink / raw)
To: ffmpeg-devel
---
libavcodec/decode.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 3e5be501b9..56ba06d5d5 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -685,10 +685,8 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
ret = apply_cropping(avctx, frame);
- if (ret < 0) {
- av_frame_unref(frame);
- return ret;
- }
+ if (ret < 0)
+ goto fail;
}
avctx->frame_number++;
@@ -706,10 +704,8 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
avci->initial_sample_rate = frame->sample_rate ? frame->sample_rate :
avctx->sample_rate;
ret = av_channel_layout_copy(&avci->initial_ch_layout, &frame->ch_layout);
- if (ret < 0) {
- av_frame_unref(frame);
- return ret;
- }
+ if (ret < 0)
+ goto fail;
break;
}
}
@@ -735,12 +731,15 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
" drop count: %d \n",
avctx->frame_number, frame->pts,
avci->changed_frames_dropped);
- av_frame_unref(frame);
- return AVERROR_INPUT_CHANGED;
+ ret = AVERROR_INPUT_CHANGED;
+ goto fail;
}
}
}
return 0;
+fail:
+ av_frame_unref(frame);
+ return ret;
}
static void get_subtitle_defaults(AVSubtitle *sub)
--
2.35.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread* [FFmpeg-devel] [PATCH 4/4] lavc/decode: validate frames output by decoders
2023-01-05 11:07 [FFmpeg-devel] [PATCH 1/4] lavc/ac3dec: fail when the sample rate is unset Anton Khirnov
2023-01-05 11:07 ` [FFmpeg-devel] [PATCH 2/4] lavc/qsvdec: check ff_decode_frame_props() return value Anton Khirnov
2023-01-05 11:07 ` [FFmpeg-devel] [PATCH 3/4] lavc/decode: deduplicate cleanup in ff_decode_receive_frame() Anton Khirnov
@ 2023-01-05 11:07 ` Anton Khirnov
2023-01-05 11:15 ` Paul B Mahol
2 siblings, 1 reply; 6+ messages in thread
From: Anton Khirnov @ 2023-01-05 11:07 UTC (permalink / raw)
To: ffmpeg-devel
Make sure no frames with invalid parameters will be seen by the caller.
---
libavcodec/decode.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
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)
--
2.35.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread