diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-28 09:49:38 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-04-04 07:54:15 +0200 |
| commit | 8d617b11cfc87b2c6056fee029ac5bc760af874a (patch) | |
| tree | f7dab726f68344a76ea9b1967acb3e3e44085a6c | |
| parent | 3623589edc7b1257bb45aa9e52c9631e133f22b6 (diff) | |
| download | ffmpeg-8d617b11cfc87b2c6056fee029ac5bc760af874a.tar.gz | |
id3v2: pad the APIC packets as required by lavc.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
| -rw-r--r-- | libavformat/id3v2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 204ea745d4..7bcea21a6b 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -476,9 +476,10 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag goto fail; } - apic->buf = av_buffer_alloc(taglen); + apic->buf = av_buffer_alloc(taglen + FF_INPUT_BUFFER_PADDING_SIZE); if (!apic->buf || avio_read(pb, apic->buf->data, taglen) != taglen) goto fail; + memset(apic->buf->data + taglen, 0, FF_INPUT_BUFFER_PADDING_SIZE); new_extra->tag = "APIC"; new_extra->data = apic; @@ -735,7 +736,7 @@ int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta **extra_meta) av_init_packet(&st->attached_pic); st->attached_pic.buf = apic->buf; st->attached_pic.data = apic->buf->data; - st->attached_pic.size = apic->buf->size; + st->attached_pic.size = apic->buf->size - FF_INPUT_BUFFER_PADDING_SIZE; st->attached_pic.stream_index = st->index; st->attached_pic.flags |= AV_PKT_FLAG_KEY; |