diff options
| author | Peter Ross <pross@xvid.org> | 2014-04-18 14:49:40 +1000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 04:25:01 +0200 |
| commit | 5331773cc33ba26b9e26ace643d926219e46a17b (patch) | |
| tree | 9b66a00bf0b540d8bfd5b69ab5b36ddf220579f4 /libavformat/omadec.c | |
| parent | c94305ae23318c8956a30485cd5642829f4f16a9 (diff) | |
| download | ffmpeg-5331773cc33ba26b9e26ace643d926219e46a17b.tar.gz | |
ff_id3v2_read: add option to limit ID3 magic number search
Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.
[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
Fixes ticket #3530.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/omadec.c')
| -rw-r--r-- | libavformat/omadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 44829ec9e5..9f3d3aa860 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -295,7 +295,7 @@ static int oma_read_header(AVFormatContext *s) ID3v2ExtraMeta *extra_meta = NULL; OMAContext *oc = s->priv_data; - ff_id3v2_read(s, ID3v2_EA3_MAGIC, &extra_meta); + ff_id3v2_read(s, ID3v2_EA3_MAGIC, &extra_meta, 0); ret = avio_read(s->pb, buf, EA3_HEADER_SIZE); if (ret < EA3_HEADER_SIZE) return -1; |