diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-02-16 03:34:11 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-02-16 03:34:11 +0000 |
| commit | e6dc9c6f99a886bee0399dfe47c2b0f5afff80e5 (patch) | |
| tree | d2c737aac9526193c13d1be77f53515f182dcd32 /libavcodec/mpeg12.c | |
| parent | 69dde1ad36b7d95b8b9268f414aa6c076212ed41 (diff) | |
| download | ffmpeg-e6dc9c6f99a886bee0399dfe47c2b0f5afff80e5.tar.gz | |
more error checks for the sequence header
Originally committed as revision 2788 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 0e47048d44..72f815cc14 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2373,6 +2373,10 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, if (get_bits1(&s->gb)) { for(i=0;i<64;i++) { v = get_bits(&s->gb, 8); + if(v==0){ + av_log(s->avctx, AV_LOG_ERROR, "intra matrix damaged\n"); + return -1; + } j = s->intra_scantable.permutated[i]; s->intra_matrix[j] = v; s->chroma_intra_matrix[j] = v; @@ -2394,6 +2398,10 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, if (get_bits1(&s->gb)) { for(i=0;i<64;i++) { v = get_bits(&s->gb, 8); + if(v==0){ + av_log(s->avctx, AV_LOG_ERROR, "inter matrix damaged\n"); + return -1; + } j = s->intra_scantable.permutated[i]; s->inter_matrix[j] = v; s->chroma_inter_matrix[j] = v; @@ -2412,6 +2420,11 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, s->chroma_inter_matrix[j] = v; } } + + if(show_bits(&s->gb, 23) != 0){ + av_log(s->avctx, AV_LOG_ERROR, "sequence header damaged\n"); + return -1; + } /* we set mpeg2 parameters so that it emulates mpeg1 */ s->progressive_sequence = 1; |