generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '242fc6394fecb403bcbd0f652920f2647d0b08ae' into release/2.4

Browse Source 
* commit '242fc6394fecb403bcbd0f652920f2647d0b08ae':
  mtv: improve header check and avoid division by zero

Conflicts:
	libavformat/mtv.c

See: 8b9b6332df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-18 01:39:47 +01:00
parent 6f9bb83dbb 242fc6394f
commit c7831e55b5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mtv.c
View File

@@ -112,7 +112,7 @@ static int mtv_read_header(AVFormatContext *s)
mtv->audio_identifier = avio_rl24(pb); mtv->audio_identifier = avio_rl24(pb);
mtv->audio_br = avio_rl16(pb); mtv->audio_br = avio_rl16(pb);
mtv->img_colorfmt = avio_rl24(pb); mtv->img_colorfmt = avio_rl24(pb);
mtv->img_bpp = avio_r8(pb)>>3; mtv->img_bpp = avio_r8(pb);
mtv->img_width = avio_rl16(pb); mtv->img_width = avio_rl16(pb);
mtv->img_height = avio_rl16(pb); mtv->img_height = avio_rl16(pb);
mtv->img_segment_size = avio_rl16(pb); mtv->img_segment_size = avio_rl16(pb);
@@ -128,17 +128,17 @@ static int mtv_read_header(AVFormatContext *s)
/* Calculate width and height if missing from header */ /* Calculate width and height if missing from header */
if(!mtv->img_width && mtv->img_height) if (!mtv->img_width && mtv->img_height > 0 && mtv->img_bpp >= 8)
mtv->img_width=mtv->img_segment_size / (mtv->img_bpp) mtv->img_width=mtv->img_segment_size / (mtv->img_bpp>>3)
/ mtv->img_height; / mtv->img_height;
if(!mtv->img_height && mtv->img_width) if (!mtv->img_height && mtv->img_width > 0 && mtv->img_bpp >= 8)
mtv->img_height=mtv->img_segment_size / (mtv->img_bpp) mtv->img_height=mtv->img_segment_size / (mtv->img_bpp>>3)
/ mtv->img_width; / mtv->img_width;
if(!mtv->img_height || !mtv->img_width || !mtv->img_segment_size){ if(!mtv->img_height || !mtv->img_width || !mtv->img_segment_size){
av_log(s, AV_LOG_ERROR, "width or height or segment_size is invalid and I cannot calculate them from other information\n"); av_log(s, AV_LOG_ERROR, "width or height or segment_size is invalid and I cannot calculate them from other information\n");
return AVERROR(EINVAL); return AVERROR_INVALIDDATA;
} }
avio_skip(pb, 4); avio_skip(pb, 4);