diff mbox

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

Message ID 1501093742-27636-1-git-send-email-nsugino@3way.com.ar
State Accepted
Commit df884e038f5dc95f55ef07500b5b99b722835f8a
Headers show

Commit Message

Nicolas Sugino July 26, 2017, 6:29 p.m. UTC 
From: Nicolas Sugino <nsugino@3way.com.ar>

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

Comments

Michael Niedermayer Aug. 9, 2017, 7:45 p.m. UTC | #1 
On Wed, Jul 26, 2017 at 03:29:02PM -0300, nsugino@3way.com.ar wrote:
> From: Nicolas Sugino <nsugino@3way.com.ar>
> 
> ---
>  libavcodec/aacdec_template.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

applied

thanks

[...]
diff mbox

Patch

diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 90cc143..a539f74 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;
     }