Commit 9e4f0cfc authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mov: Print reason of loci parsing failure

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 77cc0d5b
...@@ -211,8 +211,10 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len) ...@@ -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) ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment