From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Sun, 18 Dec 2011 13:20:14 +0000 (+0100)
Subject: Fix possible endless loop when decoding amr.
X-Git-Tag: android-x86-4.4-r1~14363
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=290e7eb77bee5a54182fb3d5fb122c1e117190da;p=android-x86%2Fexternal-ffmpeg.git

Fix possible endless loop when decoding amr.

Fixes bug 151.

Reviewed-by: Vitor Sessak
---

diff --git a/libavcodec/acelp_vectors.c b/libavcodec/acelp_vectors.c
index a44ab8cfe6..e6db556410 100644
--- a/libavcodec/acelp_vectors.c
+++ b/libavcodec/acelp_vectors.c
@@ -237,6 +237,7 @@ void ff_set_fixed_vector(float *out, const AMRFixed *in, float scale, int size)
         int x   = in->x[i], repeats = !((in->no_repeat_mask >> i) & 1);
         float y = in->y[i] * scale;
 
+        if (in->pitch_lag > 0)
         do {
             out[x] += y;
             y *= in->pitch_fac;
@@ -252,6 +253,7 @@ void ff_clear_fixed_vector(float *out, const AMRFixed *in, int size)
     for (i=0; i < in->n; i++) {
         int x  = in->x[i], repeats = !((in->no_repeat_mask >> i) & 1);
 
+        if (in->pitch_lag > 0)
         do {
             out[x] = 0.0;
             x += in->pitch_lag;