diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-18 13:57:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-18 14:07:32 +0100 |
| commit | 572c0ddc89709035cb733da870aa50373ffbd7e1 (patch) | |
| tree | a264a09e8d2b696052f587e06f119815af36bae7 /libavcodec | |
| parent | 7594ee2e6e9aada671c2958dea4848e828e9b178 (diff) | |
| download | ffmpeg-572c0ddc89709035cb733da870aa50373ffbd7e1.tar.gz | |
indeo4: Skip null frames.
Fixes crashes from Ticket845
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/indeo4.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 573718e374..eafd92b2b4 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -761,6 +761,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, av_log(avctx, AV_LOG_ERROR, "Buffer contains IP frames!\n"); } + if (ctx->frame_type >= FRAMETYPE_NULL_FIRST) + return buf_size; + if (ctx->frame.data[0]) avctx->release_buffer(avctx, &ctx->frame); |