The branch, master has been updated
via 41a9c6ec5f75d8737da3e38223b8c4e923703401 (commit)
from b4780374238a15ea42cd27fda53224e3e92335a3 (commit)
- Log -----------------------------------------------------------------
commit 41a9c6ec5f75d8737da3e38223b8c4e923703401
Author: Michael Niedermayer <[email protected]>
AuthorDate: Fri Oct 31 23:31:40 2025 +0100
Commit: Zhao Zhili <[email protected]>
CommitDate: Fri Nov 14 12:16:48 2025 +0000
avcodec/mediacodecdec_common: Check that the input to
mediacodec_wrap_sw_audio_buffer() contains channel * sample_size
Fixes: out of array access
no testcase
Found-by: Joshua Rogers <[email protected]> with ZeroPath
Reviewed-by: Joshua Rogers <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/libavcodec/mediacodecdec_common.c
b/libavcodec/mediacodecdec_common.c
index ae336ab835..9b91c8edf5 100644
--- a/libavcodec/mediacodecdec_common.c
+++ b/libavcodec/mediacodecdec_common.c
@@ -385,6 +385,12 @@ static int mediacodec_wrap_sw_audio_buffer(AVCodecContext
*avctx,
goto done;
}
+ if (info->size % (sample_size * avctx->ch_layout.nb_channels)) {
+ av_log(avctx, AV_LOG_ERROR, "input is not a multiple of channels *
sample_size\n");
+ ret = AVERROR(EINVAL);
+ goto done;
+ }
+
frame->format = avctx->sample_fmt;
frame->sample_rate = avctx->sample_rate;
frame->nb_samples = info->size / (sample_size *
avctx->ch_layout.nb_channels);
-----------------------------------------------------------------------
Summary of changes:
libavcodec/mediacodecdec_common.c | 6 ++++++
1 file changed, 6 insertions(+)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
