[FFmpeg-cvslog] avcodec/g729dec: require buf_size to be non 0
Michael Niedermayer
git at videolan.org
Sun Dec 1 18:20:03 EET 2019
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Nov 9 21:19:24 2019 +0100| [f64be9da4c8b16071ec84056a61d1fc0d5d6728c] | committer: Michael Niedermayer
avcodec/g729dec: require buf_size to be non 0
The 0 case was added with the support for multiple packets. It
appears unintended and causes extra complexity and out of array
accesses (though within padding)
No testcase
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f64be9da4c8b16071ec84056a61d1fc0d5d6728c
---
libavcodec/g729dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index eafac8a023..282668d472 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -427,7 +427,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
- if (buf_size % ((G729_8K_BLOCK_SIZE + (avctx->codec_id == AV_CODEC_ID_ACELP_KELVIN)) * avctx->channels) == 0) {
+ if (buf_size && buf_size % ((G729_8K_BLOCK_SIZE + (avctx->codec_id == AV_CODEC_ID_ACELP_KELVIN)) * avctx->channels) == 0) {
packet_type = FORMAT_G729_8K;
format = &format_g729_8k;
//Reset voice decision
More information about the ffmpeg-cvslog
mailing list