virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

mov.c: fix handling of seek return in read_mfra

Browse Source 
this would cause mfra to be ignored in files larger than 2G

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Mika Raento 2014-11-14 19:12:34 +02:00 committed by Michael Niedermayer
parent 42c8db69b6
commit b08fd7ea78
1 changed files with 14 additions and 8 deletions

22
libavformat/mov.c

@ -3819,36 +3819,42 @@ static int mov_read_mfra(MOVContext *c, AVIOContext *f)
{
int64_t stream_size = avio_size(f);
int64_t original_pos = avio_tell(f);
int64_t seek_ret;
int32_t mfra_size;
int ret = -1;
if ((ret = avio_seek(f, stream_size - 4, SEEK_SET)) < 0) goto fail;
if ((seek_ret = avio_seek(f, stream_size - 4, SEEK_SET)) < 0) {
ret = seek_ret;
goto fail;
}
mfra_size = avio_rb32(f);
if (mfra_size < 0 || mfra_size > stream_size) {
av_log(c->fc, AV_LOG_DEBUG, "doesn't look like mfra (unreasonable size)\n");
ret = -1;
goto fail;
}
if ((ret = avio_seek(f, -mfra_size, SEEK_CUR)) < 0) goto fail;
if ((seek_ret = avio_seek(f, -mfra_size, SEEK_CUR)) < 0) {
ret = seek_ret;
goto fail;
}
if (avio_rb32(f) != mfra_size) {
av_log(c->fc, AV_LOG_DEBUG, "doesn't look like mfra (size mismatch)\n");
ret = -1;
goto fail;
}
if (avio_rb32(f) != MKBETAG('m', 'f', 'r', 'a')) {
av_log(c->fc, AV_LOG_DEBUG, "doesn't look like mfra (tag mismatch)\n");
goto fail;
}
ret = 0;
av_log(c->fc, AV_LOG_VERBOSE, "stream has mfra\n");
while (!read_tfra(c, f)) {
/* Empty */
}
fail:
ret = avio_seek(f, original_pos, SEEK_SET);
if (ret < 0)
seek_ret = avio_seek(f, original_pos, SEEK_SET);
if (seek_ret < 0) {
av_log(c->fc, AV_LOG_ERROR,
"failed to seek back after looking for mfra\n");
else
ret = 0;
ret = seek_ret;
}
return ret;
}