Mercurial > libavcodec.hg
comparison h264_cavlc.c @ 11455:70472d1d2524 libavcodec
Check level_prefix a bit (this just checks the max our bitreader can handle,
as i did nt find a limit in the spec)
This should stop cavlc_decode_residual() on a zero bitstream
| author | michael |
|---|---|
| date | Wed, 10 Mar 2010 09:55:03 +0000 |
| parents | c4c8c8c426eb |
| children | 7dd2a45249a9 |
comparison
equal
deleted
inserted
replaced
| 11454:6c4e7bdce257 | 11455:70472d1d2524 |
|---|---|
| 429 level_code= (prefix<<1) + get_bits1(gb); //part | 429 level_code= (prefix<<1) + get_bits1(gb); //part |
| 430 else | 430 else |
| 431 level_code= prefix + get_bits(gb, 4); //part | 431 level_code= prefix + get_bits(gb, 4); //part |
| 432 }else{ | 432 }else{ |
| 433 level_code= 30 + get_bits(gb, prefix-3); //part | 433 level_code= 30 + get_bits(gb, prefix-3); //part |
| 434 if(prefix>=16) | 434 if(prefix>=16){ |
| 435 if(prefix > 25+3){ | |
| 436 av_log(h->s.avctx, AV_LOG_ERROR, "Invalid level prefix\n"); | |
| 437 return -1; | |
| 438 } | |
| 435 level_code += (1<<(prefix-3))-4096; | 439 level_code += (1<<(prefix-3))-4096; |
| 440 } | |
| 436 } | 441 } |
| 437 | 442 |
| 438 if(trailing_ones < 3) level_code += 2; | 443 if(trailing_ones < 3) level_code += 2; |
| 439 | 444 |
| 440 suffix_length = 2; | 445 suffix_length = 2; |