OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6294247
)
mov: Fix spherical metadata_source parsing
author
Aaron Colwell
<acolwell@google.com>
Fri, 27 Jan 2017 17:33:29 +0000
(09:33 -0800)
committer
James Almer
<jamrial@gmail.com>
Sat, 28 Jan 2017 01:52:33 +0000
(22:52 -0300)
Signed-off-by: James Almer <jamrial@gmail.com>
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
7dc550e
..
b1bfa0a
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-4566,7
+4566,7
@@
static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom)
}
size = avio_rb32(pb);
- if (size > atom.size)
+ if (size
<= 12 || size
> atom.size)
return AVERROR_INVALIDDATA;
tag = avio_rl32(pb);
@@
-4575,7
+4575,7
@@
static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0;
}
avio_skip(pb, 4); /* version + flags */
- avio_skip(pb,
avio_r8(pb)
); /* metadata_source */
+ avio_skip(pb,
size - 12
); /* metadata_source */
size = avio_rb32(pb);
if (size > atom.size)