virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

mtv: Fix FPE with 0 dimensions.

Browse Source 
Fixes Ticket755
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-15 00:26:14 +01:00
parent dcca7d66bd
commit 8b9b6332df
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/mtv.c
View File

@ -96,16 +96,26 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* Calculate width and height if missing from header */ /* Calculate width and height if missing from header */
if(!mtv->img_width) if(mtv->img_bpp>>3){
if(!mtv->img_width && mtv->img_height)
mtv->img_width=mtv->img_segment_size / (mtv->img_bpp>>3) mtv->img_width=mtv->img_segment_size / (mtv->img_bpp>>3)
/ mtv->img_height; / mtv->img_height;
if(!mtv->img_height) if(!mtv->img_height && mtv->img_width)
mtv->img_height=mtv->img_segment_size / (mtv->img_bpp>>3) mtv->img_height=mtv->img_segment_size / (mtv->img_bpp>>3)
/ mtv->img_width; / mtv->img_width;
}
if(!mtv->img_height || !mtv->img_width){
av_log(s, AV_LOG_ERROR, "width or height is invalid and I cannot calculate them from other information\n");
return AVERROR(EINVAL);
}
avio_skip(pb, 4); avio_skip(pb, 4);
audio_subsegments = avio_rl16(pb); audio_subsegments = avio_rl16(pb);
if(!audio_subsegments){
av_log(s, AV_LOG_ERROR, "audio_subsegments is 0\n");
return AVERROR(EINVAL);
}
mtv->full_segment_size = mtv->full_segment_size =
audio_subsegments * (MTV_AUDIO_PADDING_SIZE + MTV_ASUBCHUNK_DATA_SIZE) + audio_subsegments * (MTV_AUDIO_PADDING_SIZE + MTV_ASUBCHUNK_DATA_SIZE) +
mtv->img_segment_size; mtv->img_segment_size;