diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 00:10:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 21:12:36 +0200 |
| commit | 8b64036038e259abd04d119b6f70df5433e4c04f (patch) | |
| tree | e85f6c99c81f147cd278c9db904788719fdd9716 | |
| parent | f2d56c2eebe6412c21f7376aaabdeedb91f61875 (diff) | |
| download | ffmpeg-8b64036038e259abd04d119b6f70df5433e4c04f.tar.gz | |
aacsbr: change order of operation to prevent out of array read
Fixes CID732250
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c2340831b8e9032716acb0aab4893d3cc500213a)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/aacsbr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index 2f457b61cc..1110bb4a2e 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -542,7 +542,7 @@ static int sbr_hf_calc_npatches(AACContext *ac, SpectralBandReplication *sbr) k = sbr->n_master; } while (sb != sbr->kx[1] + sbr->m[1]); - if (sbr->patch_num_subbands[sbr->num_patches-1] < 3 && sbr->num_patches > 1) + if (sbr->num_patches > 1 && sbr->patch_num_subbands[sbr->num_patches-1] < 3) sbr->num_patches--; return 0; |