kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-03 22:57:16 +00:00
Code Issues Projects Releases Wiki Activity

fix FSCORE-124

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8361 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-05-12 15:21:29 +00:00
parent 1f8e6c96a6
commit 8c273b1cbe
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/mod/formats/mod_shout/layer3.c
View File

@ -609,6 +609,7 @@ static int III_dequantize_sample(struct mpstr *mp, real xr[SBLIMIT][SSLIMIT], in
{ {
int shift = 1 + gr_info->scalefac_scale; int shift = 1 + gr_info->scalefac_scale;
real *xrpnt = (real *) xr; real *xrpnt = (real *) xr;
real *toomuch = (real *) xr + (SBLIMIT * SBLIMIT * sizeof(real));
int l[3], l3; int l[3], l3;
int part2remain = gr_info->part2_3_length - part2bits; int part2remain = gr_info->part2_3_length - part2bits;
int *me; int *me;
@ -668,7 +669,9 @@ static int III_dequantize_sample(struct mpstr *mp, real xr[SBLIMIT][SSLIMIT], in
register int x, y; register int x, y;
if ((!mc)) { if ((!mc)) {
mc = *m++; mc = *m++;
xrpnt = ((real *) xr) + (*m++); if ((xrpnt = ((real *) xr) + (*m++)) > toomuch) {
return 1;
}
lwin = *m++; lwin = *m++;
cb = *m++; cb = *m++;
if (lwin == 3) { if (lwin == 3) {
@ -707,7 +710,9 @@ static int III_dequantize_sample(struct mpstr *mp, real xr[SBLIMIT][SSLIMIT], in
part2remain--; part2remain--;
} else } else
*xrpnt = 0.0; *xrpnt = 0.0;
xrpnt += step; if ((xrpnt += step) > toomuch) {
return 1;
}
if (y == 15) { if (y == 15) {
max[lwin] = cb; max[lwin] = cb;
part2remain -= h->linbits + 1; part2remain -= h->linbits + 1;
@ -725,7 +730,9 @@ static int III_dequantize_sample(struct mpstr *mp, real xr[SBLIMIT][SSLIMIT], in
part2remain--; part2remain--;
} else } else
*xrpnt = 0.0; *xrpnt = 0.0;
xrpnt += step; if ((xrpnt += step) > toomuch) {
return 1;
}
} }
} }
for (; l3 && (part2remain > 0); l3--) { for (; l3 && (part2remain > 0); l3--) {
@ -747,7 +754,9 @@ static int III_dequantize_sample(struct mpstr *mp, real xr[SBLIMIT][SSLIMIT], in
if (!(i & 1)) { if (!(i & 1)) {
if (!mc) { if (!mc) {
mc = *m++; mc = *m++;
xrpnt = ((real *) xr) + (*m++); if ((xrpnt = ((real *) xr) + (*m++)) > toomuch) {
return 1;
}
lwin = *m++; lwin = *m++;
cb = *m++; cb = *m++;
if (lwin == 3) { if (lwin == 3) {
@ -773,14 +782,18 @@ static int III_dequantize_sample(struct mpstr *mp, real xr[SBLIMIT][SSLIMIT], in
*xrpnt = v; *xrpnt = v;
} else } else
*xrpnt = 0.0; *xrpnt = 0.0;
xrpnt += step; if ((xrpnt += step) > toomuch) {
return 1;
}
} }
} }
while (m < me) { while (m < me) {
if (!mc) { if (!mc) {
mc = *m++; mc = *m++;
xrpnt = ((real *) xr) + *m++; if ((xrpnt = ((real *) xr) + *m++) > toomuch) {
return 1;
}
if ((*m++) == 3) if ((*m++) == 3)
step = 1; step = 1;
else else
@ -789,9 +802,13 @@ static int III_dequantize_sample(struct mpstr *mp, real xr[SBLIMIT][SSLIMIT], in
} }
mc--; mc--;
*xrpnt = 0.0; *xrpnt = 0.0;
xrpnt += step; if ((xrpnt += step) > toomuch) {
return 1;
}
*xrpnt = 0.0; *xrpnt = 0.0;
xrpnt += step; if ((xrpnt += step) > toomuch) {
return 1;
}
/* we could add a little opt. here: /* we could add a little opt. here:
* if we finished a band for window 3 or a long band * if we finished a band for window 3 or a long band
* further bands could copied in a simple loop without a * further bands could copied in a simple loop without a
@ -863,6 +880,11 @@ static int III_dequantize_sample(struct mpstr *mp, real xr[SBLIMIT][SSLIMIT], in
x = y >> 4; x = y >> 4;
y &= 0xf; y &= 0xf;
} }
if (xrpnt >= toomuch) {
return 1;
}
if (x == 15) { if (x == 15) {
max = cb; max = cb;
part2remain -= h->linbits + 1; part2remain -= h->linbits + 1;
@ -971,7 +993,7 @@ static int III_dequantize_sample(struct mpstr *mp, real xr[SBLIMIT][SSLIMIT], in
#if 0 #if 0
static int III_dequantize_sample_ms(real xr[2][SBLIMIT][SSLIMIT], int *scf, struct gr_info_s *gr_info, int sfreq, int part2bits) static int III_dequantize_sample_ms(real xr[2][SBLIMIT][SSLIMIT], int *scf, struct gr_info_s *gr_info, int sfreq, int part2bits)
{ {ma
int shift = 1 + gr_info->scalefac_scale; int shift = 1 + gr_info->scalefac_scale;
real *xrpnt = (real *) xr[1]; real *xrpnt = (real *) xr[1];
real *xr0pnt = (real *) xr[0]; real *xr0pnt = (real *) xr[0];