[FFmpeg-cvslog] g729dec: check pitch_delay_int.

Michael Niedermayer git at videolan.org
Fri Dec 14 02:52:16 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 14 01:12:56 2012 +0100| [a974adc3c78c4bcf62dd2a10ff1ae8eae6fa29ef] | committer: Michael Niedermayer

g729dec: check pitch_delay_int.

Fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a974adc3c78c4bcf62dd2a10ff1ae8eae6fa29ef
---

 libavcodec/g729dec.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index b44120f..db3f013 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -510,6 +510,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
 
         /* Round pitch delay to nearest (used everywhere except ff_acelp_interpolate). */
         pitch_delay_int[i]  = (pitch_delay_3x + 1) / 3;
+        if (pitch_delay_int[i] > PITCH_DELAY_MAX) {
+            av_log(avctx, AV_LOG_WARNING, "pitch_delay_int %d is too large\n", pitch_delay_int[i]);
+            pitch_delay_int[i] = PITCH_DELAY_MAX;
+        }
 
         if (frame_erasure) {
             ctx->rand_value = g729_prng(ctx->rand_value);



More information about the ffmpeg-cvslog mailing list