On 6/24/12, Anton Khirnov <[email protected]> wrote:
> ---
> libavformat/apetag.c | 28 ++++++++++++++++++++++++++--
> 1 file changed, 26 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/apetag.c b/libavformat/apetag.c
> index 68c987e..14ceaa7 100644
> --- a/libavformat/apetag.c
> +++ b/libavformat/apetag.c
> @@ -24,6 +24,7 @@
> #include "libavutil/dict.h"
> #include "avformat.h"
> #include "apetag.h"
> +#include "internal.h"
>
> #define APE_TAG_VERSION 2000
> #define APE_TAG_FOOTER_BYTES 32
> @@ -56,10 +57,33 @@ static int ape_tag_read_field(AVFormatContext *s)
> return -1;
> if (flags & APE_TAG_FLAG_IS_BINARY) {
> uint8_t filename[1024];
> + enum CodecID id;
> + int filename_size;
> AVStream *st = avformat_new_stream(s, NULL);
> if (!st)
> return AVERROR(ENOMEM);
> - avio_get_str(pb, INT_MAX, filename, sizeof(filename));
> + filename_size = avio_get_str(pb, INT_MAX, filename,
> sizeof(filename));
> +
> + av_dict_set(&st->metadata, key, filename, 0);
> +
> + if ((id = ff_guess_image2_codec(filename)) != CODEC_ID_NONE) {
> + AVPacket pkt;
> + int ret;
> +
> + ret = av_get_packet(s->pb, &pkt, size - filename_size);
Is this safe?
> + if (ret < 0) {
> + av_log(s, AV_LOG_ERROR, "Error reading cover art.\n");
> + return ret;
> + }
> +
> + st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
> + st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
> + st->codec->codec_id = id;
> +
> + st->attached_pic = pkt;
> + st->attached_pic.stream_index = st->index;
> + st->attached_pic.flags |= AV_PKT_FLAG_KEY;
> + } else {
> st->codec->extradata = av_malloc(size +
> FF_INPUT_BUFFER_PADDING_SIZE);
> if (!st->codec->extradata)
> return AVERROR(ENOMEM);
> @@ -68,8 +92,8 @@ static int ape_tag_read_field(AVFormatContext *s)
> return AVERROR(EIO);
> }
> st->codec->extradata_size = size;
> - av_dict_set(&st->metadata, key, filename, 0);
> st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
> + }
> } else {
> value = av_malloc(size+1);
> if (!value)
> --
> 1.7.10
>
> _______________________________________________
> libav-devel mailing list
> [email protected]
> https://lists.libav.org/mailman/listinfo/libav-devel
>
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
