virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

mpegvideo_parser: avoid signed overflow in bitrate calculation

Browse Source 
CC: libav-stable@libav.org
Bug-Id: 981
Found-By: Agostino Sarubbo
This commit is contained in:
Anton Khirnov
2016-12-17 15:07:51 +01:00
parent 46191a2da1
commit 58405de095
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mpegvideo_parser.c
View File

@@ -97,7 +97,14 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
pc->width |=(horiz_size_ext << 12); pc->width |=(horiz_size_ext << 12);
pc->height |=( vert_size_ext << 12); pc->height |=( vert_size_ext << 12);
avctx->bit_rate += (bit_rate_ext << 18) * 400;
bit_rate_ext <<= 18;
if (bit_rate_ext < INT_MAX / 400 &&
bit_rate_ext * 400 < INT_MAX - avctx->bit_rate) {
avctx->bit_rate += bit_rate_ext * 400;
} else
avctx->bit_rate = 0;
if(did_set_size) if(did_set_size)
ff_set_dimensions(avctx, pc->width, pc->height); ff_set_dimensions(avctx, pc->width, pc->height);
avctx->framerate.num = pc->frame_rate.num * (frame_rate_ext_n + 1) * 2; avctx->framerate.num = pc->frame_rate.num * (frame_rate_ext_n + 1) * 2;