diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 16:42:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 00:55:24 +0200 |
| commit | dff4dbdf6035db4dfb0432f1fef44bb1afdef5c4 (patch) | |
| tree | b33d4ad403c035073f79d39e94a899a02fd13b72 | |
| parent | 622e926e9cdfa620acced831efaea74b7a290e3d (diff) | |
| download | ffmpeg-dff4dbdf6035db4dfb0432f1fef44bb1afdef5c4.tar.gz | |
h264_cavlc: check prefix before using it.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 39f0a45a1a087e5bbef84fa3366942384ec32155)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_cavlc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index a4debade2e..2d62baa13c 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -513,7 +513,7 @@ static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, in else level_code= prefix + get_bits(gb, 4); //part }else{ - level_code= 30 + get_bits(gb, prefix-3); //part + level_code= 30; if(prefix>=16){ if(prefix > 25+3){ av_log(h->s.avctx, AV_LOG_ERROR, "Invalid level prefix\n"); @@ -521,6 +521,7 @@ static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, in } level_code += (1<<(prefix-3))-4096; } + level_code += get_bits(gb, prefix-3); //part } if(trailing_ones < 3) level_code += 2; |