RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mlpdec: More validation for read_channel_params() 

Originally committed as revision 18235 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2009-03-30 03:20:01 +00:00
parent 06e34be88f
commit 125cf771f6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/mlpdec.c
View File

@ -561,6 +561,11 @@ static int read_channel_params(MLPDecodeContext *m, unsigned int substr,
if (read_filter_params(m, gbp, ch, IIR) < 0) if (read_filter_params(m, gbp, ch, IIR) < 0)
return -1; return -1;
if (fir->order + iir->order > 8) {
av_log(m->avctx, AV_LOG_ERROR, "Total filter orders too high.\n");
return -1;
}
if (fir->order && iir->order && if (fir->order && iir->order &&
fir->shift != iir->shift) { fir->shift != iir->shift) {
av_log(m->avctx, AV_LOG_ERROR, av_log(m->avctx, AV_LOG_ERROR,
@ -582,9 +587,12 @@ static int read_channel_params(MLPDecodeContext *m, unsigned int substr,
cp->codebook = get_bits(gbp, 2); cp->codebook = get_bits(gbp, 2);
cp->huff_lsbs = get_bits(gbp, 5); cp->huff_lsbs = get_bits(gbp, 5);
cp->sign_huff_offset = calculate_sign_huff(m, substr, ch); if (cp->huff_lsbs > 24) {
av_log(m->avctx, AV_LOG_ERROR, "Invalid huff_lsbs.\n");
return -1;
}
/* TODO: validate */ cp->sign_huff_offset = calculate_sign_huff(m, substr, ch);
return 0; return 0;
} }