diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 20:14:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 20:15:21 +0200 |
| commit | afb327caf3d1fe873ac0c46aa9af89dd5fb471f2 (patch) | |
| tree | 80512dc2a6b4c9c522cf9fd562d9bcb60baa5bde | |
| parent | aa6f58dd96f32ccf74315da996a5514af6c09687 (diff) | |
| parent | 072198166e9a333662042deef066fe41b3ad8070 (diff) | |
| download | ffmpeg-afb327caf3d1fe873ac0c46aa9af89dd5fb471f2.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/mov: Do not overread iTunes metadata.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index dc31e5a6f7..c63e817276 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -342,7 +342,7 @@ retry: if (c->itunes_metadata && atom.size > 8) { int data_size = avio_rb32(pb); int tag = avio_rl32(pb); - if (tag == MKTAG('d','a','t','a')) { + if (tag == MKTAG('d','a','t','a') && data_size <= atom.size) { data_type = avio_rb32(pb); // type avio_rb32(pb); // unknown str_size = data_size - 16; |