generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/wmalosslessdec: Use unsigned operations for overflowing cases

Browse Source 
Fixes undefined behavior in fate-lossless-wma24-2

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-05-16 13:14:31 +02:00
parent 5a8b41b4a7
commit bacc4b6e81
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/lossless_audiodsp.c
View File

@@ -45,9 +45,9 @@ static int32_t scalarproduct_and_madd_int32_c(int16_t *v1, const int32_t *v2,
int res = 0; int res = 0;
do { do {
res += *v1 * *v2++; res += *v1 * (uint32_t)*v2++;
*v1++ += mul * *v3++; *v1++ += mul * *v3++;
res += *v1 * *v2++; res += *v1 * (uint32_t)*v2++;
*v1++ += mul * *v3++; *v1++ += mul * *v3++;
} while (order-=2); } while (order-=2);
return res; return res;

6
libavcodec/wmalosslessdec.c
View File

@@ -674,10 +674,10 @@ static void mclms_predict(WmallDecodeCtx *s, int icoef, int *pred)
if (!s->is_channel_coded[ich]) if (!s->is_channel_coded[ich])
continue; continue;
for (i = 0; i < order * num_channels; i++) for (i = 0; i < order * num_channels; i++)
pred[ich] += s->mclms_prevvalues[i + s->mclms_recent] * pred[ich] += (uint32_t)s->mclms_prevvalues[i + s->mclms_recent] *
s->mclms_coeffs[i + order * num_channels * ich]; s->mclms_coeffs[i + order * num_channels * ich];
for (i = 0; i < ich; i++) for (i = 0; i < ich; i++)
pred[ich] += s->channel_residues[i][icoef] * pred[ich] += (uint32_t)s->channel_residues[i][icoef] *
s->mclms_coeffs_cur[i + num_channels * ich]; s->mclms_coeffs_cur[i + num_channels * ich];
pred[ich] += 1 << s->mclms_scaling - 1; pred[ich] += 1 << s->mclms_scaling - 1;
pred[ich] >>= s->mclms_scaling; pred[ich] >>= s->mclms_scaling;
@@ -822,7 +822,7 @@ static void revert_acfilter(WmallDecodeCtx *s, int tile_size)
for (i = order; i < tile_size; i++) { for (i = order; i < tile_size; i++) {
pred = 0; pred = 0;
for (j = 0; j < order; j++) for (j = 0; j < order; j++)
pred += s->channel_residues[ich][i - j - 1] * filter_coeffs[j]; pred += (uint32_t)s->channel_residues[ich][i - j - 1] * filter_coeffs[j];
pred >>= scaling; pred >>= scaling;
s->channel_residues[ich][i] += pred; s->channel_residues[ich][i] += pred;
} }