summaryrefslogtreecommitdiff
path: root/libavcodec/sipr.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-10-10 20:41:31 +0100
committerMans Rullgard <mans@mansr.com>2011-10-11 12:05:51 +0100
commitc79d2a20bad59298188171f1316a830d563a41ee (patch)
tree995ab0504ad16adcc67e84a43f87bf5939fbebcb /libavcodec/sipr.c
parentcb668476ab1343d27e03edc0b32f57ca7a187471 (diff)
downloadffmpeg-c79d2a20bad59298188171f1316a830d563a41ee.tar.gz
sipr: fix get_bits(0) calls
Zero-length get_bits() is undefined, must check before calling. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/sipr.c')
-rw-r--r--libavcodec/sipr.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c
index f57ec4fd2a..08dd63aa5c 100644
--- a/libavcodec/sipr.c
+++ b/libavcodec/sipr.c
@@ -194,14 +194,16 @@ static void decode_parameters(SiprParameters* parms, GetBitContext *pgb,
{
int i, j;
- parms->ma_pred_switch = get_bits(pgb, p->ma_predictor_bits);
+ if (p->ma_predictor_bits)
+ parms->ma_pred_switch = get_bits(pgb, p->ma_predictor_bits);
for (i = 0; i < 5; i++)
parms->vq_indexes[i] = get_bits(pgb, p->vq_indexes_bits[i]);
for (i = 0; i < p->subframe_count; i++) {
parms->pitch_delay[i] = get_bits(pgb, p->pitch_delay_bits[i]);
- parms->gp_index[i] = get_bits(pgb, p->gp_index_bits);
+ if (p->gp_index_bits)
+ parms->gp_index[i] = get_bits(pgb, p->gp_index_bits);
for (j = 0; j < p->number_of_fc_indexes; j++)
parms->fc_indexes[i][j] = get_bits(pgb, p->fc_index_bits[j]);