mirror of https://git.ffmpeg.org/ffmpeg.git
mov: Print reason of loci parsing failure
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
d34826c33d
commit
704d2bd18b
|
@ -226,8 +226,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);
|
||||||
|
@ -235,13 +237,18 @@ 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,
|
||||||
|
"loci too short (%u bytes left, need at least %d)\n", len, 14);
|
||||||
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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue