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

mlp: check huff_lsbs only when codebook is used 

When no codebook is used, huff_lsbs can be more than 24 and still decode to
original values once filters are applied.

Signed-off-by: Jai Luthra <me@jailuthra.in>
This commit is contained in:
Jai Luthra 2020-02-03 00:33:00 +05:30 committed by Paul B Mahol
parent d6cef144e2
commit 49cfbedb9d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mlpdec.c
View File

@ -829,7 +829,7 @@ static int read_channel_params(MLPDecodeContext *m, unsigned int substr,
cp->codebook = get_bits(gbp, 2);
cp->huff_lsbs = get_bits(gbp, 5);
if (cp->huff_lsbs > 24) {
if (cp->codebook > 0 && cp->huff_lsbs > 24) {
av_log(m->avctx, AV_LOG_ERROR, "Invalid huff_lsbs.\n");
cp->huff_lsbs = 0;
return AVERROR_INVALIDDATA;

3
libavcodec/mlpenc.c
View File

@ -987,6 +987,9 @@ static void write_decoding_params(MLPEncodeContext *ctx, PutBitContext *pb,
put_bits(pb, 1, 0);
}
}
if (cp->codebook > 0 && cp->huff_lsbs > 24) {
av_log(ctx->avctx, AV_LOG_ERROR, "Invalid Huff LSBs\n");
}
put_bits(pb, 2, cp->codebook );
put_bits(pb, 5, cp->huff_lsbs);