[FFmpeg-cvslog] avcodec/aacdec: Fix PCE channel_layout verification

Nicolas Sugino git at videolan.org
Wed Aug 9 23:08:58 EEST 2017


ffmpeg | branch: master | Nicolas Sugino <nsugino at 3way.com.ar> | Wed Jul 26 15:29:02 2017 -0300| [df884e038f5dc95f55ef07500b5b99b722835f8a] | committer: Michael Niedermayer

avcodec/aacdec: Fix PCE channel_layout verification

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df884e038f5dc95f55ef07500b5b99b722835f8a
---

 libavcodec/aacdec_template.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 90cc143781..a539f74e6f 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -763,7 +763,7 @@ static int decode_pce(AVCodecContext *avctx, MPEG4AudioConfig *m4ac,
     if (get_bits1(gb))
         skip_bits(gb, 3); // mixdown_coeff_index and pseudo_surround
 
-    if (get_bits_left(gb) < 4 * (num_front + num_side + num_back + num_lfe + num_assoc_data + num_cc)) {
+    if (get_bits_left(gb) < 5 * (num_front + num_side + num_back + num_cc) + 4 *(num_lfe + num_assoc_data + num_cc)) {
         av_log(avctx, AV_LOG_ERROR, "decode_pce: " overread_err);
         return -1;
     }



More information about the ffmpeg-cvslog mailing list