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

riff: retry reading metadata without padding if it fails with

Browse Source 
Fixes Ticket1821

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d0c27e88d2)
This commit is contained in:
Michael Niedermayer
2012-10-18 04:58:20 +02:00
committed by Carl Eugen Hoyos
parent 213f651498
commit 1a5b7ce0ea
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/riff.c
View File

@@ -704,12 +704,17 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size)
char key[5] = {0}; char key[5] = {0};
char *value; char *value;
chunk_code = avio_rl32(pb);
chunk_size = avio_rl32(pb);
if (chunk_size > end || end - chunk_size < cur || chunk_size == UINT_MAX) {
avio_seek(pb, -9, SEEK_CUR);
chunk_code = avio_rl32(pb); chunk_code = avio_rl32(pb);
chunk_size = avio_rl32(pb); chunk_size = avio_rl32(pb);
if (chunk_size > end || end - chunk_size < cur || chunk_size == UINT_MAX) { if (chunk_size > end || end - chunk_size < cur || chunk_size == UINT_MAX) {
av_log(s, AV_LOG_ERROR, "too big INFO subchunk\n"); av_log(s, AV_LOG_ERROR, "too big INFO subchunk\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
}
chunk_size += (chunk_size & 1); chunk_size += (chunk_size & 1);