summaryrefslogtreecommitdiff
path: root/libavcodec/yop.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-01 15:52:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-01 15:52:20 +0200
commitfebc013dc5d6db1535a4f91cf02fa8089038937c (patch)
tree0b391482baee89a8207de0100431fdb0d06db016 /libavcodec/yop.c
parentb6fdf8dea7aaf3cb9a979dce91f752c2ce3086a3 (diff)
yopdec: check frame oddness to be within supported limits
Fixes Ticket1365 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/yop.c')
-rw-r--r--libavcodec/yop.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/yop.c b/libavcodec/yop.c
index df61426dfe..42059e1c5a 100644
--- a/libavcodec/yop.c
+++ b/libavcodec/yop.c
@@ -224,6 +224,10 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
s->low_nibble = NULL;
is_odd_frame = avpkt->data[0];
+ if(is_odd_frame>1){
+ av_log(avctx, AV_LOG_ERROR, "frame is too odd %d\n", is_odd_frame);
+ return AVERROR_INVALIDDATA;
+ }
firstcolor = s->first_color[is_odd_frame];
palette = (uint32_t *)s->frame.data[1];