Mercurial > libavcodec.hg

changeset 11450:95123a24a580 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
aacsbr: Check that bs_num_env is valid before writing arrays with it as an offset.
author alexc
date Tue, 09 Mar 2010 21:50:10 +0000
parents e62f45fd47d4
children 01559518729e
files aacsbr.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/aacsbr.c	Tue Mar 09 21:46:46 2010 +0000
+++ b/aacsbr.c	Tue Mar 09 21:50:10 2010 +0000
@@ -689,7 +689,6 @@
         num_rel_lead                        = get_bits(gb, 2);
         num_rel_trail                       = get_bits(gb, 2);
         ch_data->bs_num_env                 = num_rel_lead + num_rel_trail + 1;
-        ch_data->t_env[ch_data->bs_num_env] = abs_bord_trail;
 
         if (ch_data->bs_num_env > 5) {
             av_log(ac->avccontext, AV_LOG_ERROR,
@@ -698,6 +697,8 @@
             return -1;
         }
 
+        ch_data->t_env[ch_data->bs_num_env] = abs_bord_trail;
+
         for (i = 0; i < num_rel_lead; i++)
             ch_data->t_env[i + 1] = ch_data->t_env[i] + 2 * get_bits(gb, 2) + 2;
         for (i = 0; i < num_rel_trail; i++)