The branch, master has been updated
via cfce5955725c949b363eb2765b6a5891890eca72 (commit)
from 8e4c904c8e30c68ea6c7da3740139bf2f4ffa907 (commit)
- Log -----------------------------------------------------------------
commit cfce5955725c949b363eb2765b6a5891890eca72
Author: Michael Niedermayer <[email protected]>
AuthorDate: Fri Aug 8 22:37:47 2025 +0200
Commit: michaelni <[email protected]>
CommitDate: Sun Aug 10 02:29:09 2025 +0000
avcodec/apv_decode: make apv_format_table consistent with the code and
check it
Fixes: writing in a null pointer
Fixes:
435278398/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APV_fuzzer-4566392923029504
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/libavcodec/apv_decode.c b/libavcodec/apv_decode.c
index eb47298e2e..330d4980c0 100644
--- a/libavcodec/apv_decode.c
+++ b/libavcodec/apv_decode.c
@@ -52,9 +52,9 @@ typedef struct APVDecodeContext {
static const enum AVPixelFormat apv_format_table[5][5] = {
{ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12,
AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16 },
{ 0 }, // 4:2:0 is not valid.
- { AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P12,
AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUV422P16 },
- { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12,
AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUV444P16 },
- { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12,
AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUVA444P16 },
+ { AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P12,
AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV422P16 },
+ { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12,
AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV444P16 },
+ { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, 0
,AV_PIX_FMT_YUVA444P16 },
};
static APVVLCLUT decode_lut;
@@ -75,6 +75,11 @@ static int apv_decode_check_format(AVCodecContext *avctx,
avctx->pix_fmt =
apv_format_table[header->frame_info.chroma_format_idc][bit_depth - 4
>> 2];
+ if (!avctx->pix_fmt) {
+ avpriv_request_sample(avctx, "YUVA444P14");
+ return AVERROR_PATCHWELCOME;
+ }
+
err = ff_set_dimensions(avctx,
FFALIGN(header->frame_info.frame_width, 16),
FFALIGN(header->frame_info.frame_height, 16));
-----------------------------------------------------------------------
Summary of changes:
libavcodec/apv_decode.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
