virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

g723_1dec: Fix lsp2lpc() so it can handle values at the ends of the table.

Browse Source 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-16 21:25:40 +01:00
parent 2207ea44fb
commit 6535d81d87
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/g723_1.c
View File

@ -359,7 +359,7 @@ static void lsp2lpc(int16_t *lpc)
/* Calculate negative cosine */ /* Calculate negative cosine */
for (j = 0; j < LPC_ORDER; j++) { for (j = 0; j < LPC_ORDER; j++) {
int index = lpc[j] >> 7; int index = (lpc[j] >> 7) & 0x1FF;
int offset = lpc[j] & 0x7f; int offset = lpc[j] & 0x7f;
int temp1 = cos_tab[index] << 16; int temp1 = cos_tab[index] << 16;
int temp2 = (cos_tab[index + 1] - cos_tab[index]) * int temp2 = (cos_tab[index + 1] - cos_tab[index]) *

3
libavcodec/g723_1_data.h
View File

@ -128,7 +128,7 @@ static const int16_t dc_lsp[LPC_ORDER] = {
/** /**
* Cosine table scaled by 2^14 * Cosine table scaled by 2^14
*/ */
static const int16_t cos_tab[COS_TBL_SIZE] = { static const int16_t cos_tab[COS_TBL_SIZE+1] = {
16384, 16383, 16379, 16373, 16364, 16353, 16340, 16324, 16384, 16383, 16379, 16373, 16364, 16353, 16340, 16324,
16305, 16284, 16261, 16235, 16207, 16176, 16143, 16107, 16305, 16284, 16261, 16235, 16207, 16176, 16143, 16107,
16069, 16029, 15986, 15941, 15893, 15843, 15791, 15736, 16069, 16029, 15986, 15941, 15893, 15843, 15791, 15736,
@ -193,6 +193,7 @@ static const int16_t cos_tab[COS_TBL_SIZE] = {
15679, 15736, 15791, 15843, 15893, 15941, 15986, 16029, 15679, 15736, 15791, 15843, 15893, 15941, 15986, 16029,
16069, 16107, 16143, 16176, 16207, 16235, 16261, 16284, 16069, 16107, 16143, 16176, 16207, 16235, 16261, 16284,
16305, 16324, 16340, 16353, 16364, 16373, 16379, 16383, 16305, 16324, 16340, 16353, 16364, 16373, 16379, 16383,
16384
}; };
/** /**