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

avformat/icodec: Factor failure code out in read_header()

Browse Source 
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 27ee67c00f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-11-04 01:06:45 +01:00
parent 1703863faa
commit ee7cdaaa3f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/icodec.c
View File

@ -113,8 +113,7 @@ static int read_header(AVFormatContext *s)
ico->images[i].size = avio_rl32(pb);
if (ico->images[i].size <= 0) {
av_log(s, AV_LOG_ERROR, "Invalid image size %d\n", ico->images[i].size);
av_freep(&ico->images);
return AVERROR_INVALIDDATA;
goto fail;
}
ico->images[i].offset = avio_rl32(pb);
@ -130,8 +129,7 @@ static int read_header(AVFormatContext *s)
break;
case 40:
if (ico->images[i].size < 40) {
av_freep(&ico->images);
return AVERROR_INVALIDDATA;
goto fail;
}
st->codecpar->codec_id = AV_CODEC_ID_BMP;
tmp = avio_rl32(pb);
@ -143,12 +141,14 @@ static int read_header(AVFormatContext *s)
break;
default:
avpriv_request_sample(s, "codec %d", codec);
av_freep(&ico->images);
return AVERROR_INVALIDDATA;
goto fail;
}
}
return 0;
fail:
av_freep(&ico->images);
return AVERROR_INVALIDDATA;
}
static int read_packet(AVFormatContext *s, AVPacket *pkt)