diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-01 15:51:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 21:36:05 +0200 |
| commit | e37599001cefd7efb683c8228feedf3d291ef1db (patch) | |
| tree | d5e3094706c8cd55b5d1fe979bc150743e816cc3 /libavcodec/yop.c | |
| parent | 32ac7c0cf6761c9ccc1c13ffad92d71ecf9c3f7c (diff) | |
| download | ffmpeg-e37599001cefd7efb683c8228feedf3d291ef1db.tar.gz | |
yopdec: check that palette fits in the packet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b6fdf8dea7aaf3cb9a979dce91f752c2ce3086a3)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/yop.c')
| -rw-r--r-- | libavcodec/yop.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 1adbd612ad..69f2e8e816 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -203,6 +203,11 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size, if (s->frame.data[0]) avctx->release_buffer(avctx, &s->frame); + if (avpkt->size < 4 + 3*s->num_pal_colors) { + av_log(avctx, AV_LOG_ERROR, "packet of size %d too small\n", avpkt->size); + return AVERROR_INVALIDDATA; + } + ret = avctx->get_buffer(avctx, &s->frame); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |