diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 20:34:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 03:40:59 +0200 |
| commit | ca2ccd85d7d1d0cb0c90f9da965a53bb98187b8f (patch) | |
| tree | 104138cc8d204f07de2d2fa7d64be720b6d67053 /libavcodec/ac3enc_template.c | |
| parent | 437f6fb488416f602ded7f0d4fc41ca1f227d4a7 (diff) | |
| download | ffmpeg-ca2ccd85d7d1d0cb0c90f9da965a53bb98187b8f.tar.gz | |
avcodec/ac3enc_template: fix out of array read
Found-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d85ebea3f3b68ebccfe308fa839fc30fa634e4de)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_template.c')
| -rw-r--r-- | libavcodec/ac3enc_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index 192d16f57e..0d6bc45fd8 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -263,7 +263,7 @@ static void apply_channel_coupling(AC3EncodeContext *s) energy_cpl = energy[blk][CPL_CH][bnd]; energy_ch = energy[blk][ch][bnd]; blk1 = blk+1; - while (!s->blocks[blk1].new_cpl_coords[ch] && blk1 < s->num_blocks) { + while (blk1 < s->num_blocks && !s->blocks[blk1].new_cpl_coords[ch]) { if (s->blocks[blk1].cpl_in_use) { energy_cpl += energy[blk1][CPL_CH][bnd]; energy_ch += energy[blk1][ch][bnd]; |