summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-16 13:50:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-21 20:43:39 +0200
commit7e3d413f122cadcccecc51f59a81fd5994f8c0d0 (patch)
tree6844d75b2d5363604a114e24c40c6b7f912da5d0 /libavformat/mov.c
parent1bf416dfc39f0768904d081cf82856d5dd2f2803 (diff)
downloadffmpeg-7e3d413f122cadcccecc51f59a81fd5994f8c0d0.tar.gz
avformat/mov: Print reason of loci parsing failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9e4f0cfc8ff4ab635ea12bdbd8d85d8bb1ba25f9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r--libavformat/mov.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 367752e1c9..7bab0baa40 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -230,8 +230,10 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
double longitude, latitude;
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;
+ }
avio_skip(pb, 4); // version+flags
langcode = avio_rb16(pb);
@@ -239,13 +241,17 @@ static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
len -= 6;
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;
+ }
avio_skip(pb, 1); // role
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;
+ }
longitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16);
latitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16);