virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/mov: Print reason of loci parsing failure

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-16 13:50:38 +02:00
parent 77cc0d5b59
commit 9e4f0cfc8f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mov.c
View File

@ -211,8 +211,10 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
double longitude, latitude; double longitude, latitude;
const char *key = "location"; const char *key = "location";
if (len < 4 + 2 + 1 + 1 + 4 + 4 + 4) if (len < 4 + 2 + 1 + 1 + 4 + 4 + 4) {
av_log(c->fc, AV_LOG_ERROR, "loci too short\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}
avio_skip(pb, 4); // version+flags avio_skip(pb, 4); // version+flags
langcode = avio_rb16(pb); langcode = avio_rb16(pb);
@ -220,13 +222,17 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
len -= 6; len -= 6;
len -= avio_get_str(pb, len, buf, sizeof(buf)); // place name len -= avio_get_str(pb, len, buf, sizeof(buf)); // place name
if (len < 1) if (len < 1) {
av_log(c->fc, AV_LOG_ERROR, "place name too long\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}
avio_skip(pb, 1); // role avio_skip(pb, 1); // role
len -= 1; len -= 1;
if (len < 14) if (len < 14) {
av_log(c->fc, AV_LOG_ERROR, "no space for coordinates left (%d)\n", len);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}
longitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16); longitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16);
latitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16); latitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16);