Commit f0dd9d45 authored by Kostya Shishkov's avatar Kostya Shishkov
Browse files

Check unp_size for possible overflows too

Originally committed as revision 10490 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 208506e2
...@@ -590,7 +590,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, int *data_size, ...@@ -590,7 +590,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
} }
stereo = get_bits1(&gb); stereo = get_bits1(&gb);
bits = get_bits1(&gb); bits = get_bits1(&gb);
if ((unp_size << !bits) > *data_size) { if (unp_size & 0xC0000000 || (unp_size << !bits) > *data_size) {
av_log(avctx, AV_LOG_ERROR, "Frame is too large to fit in buffer\n"); av_log(avctx, AV_LOG_ERROR, "Frame is too large to fit in buffer\n");
return -1; return -1;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment