From dba5b06ead6bbec8fd1207d778240188182c8361 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 6 Jul 2012 22:21:09 +0200 Subject: flacdec: don't create an attached picture stream until we have all information. This way we don't end with an invalid stream if parsing the picture fails. --- libavformat/flacdec.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libavformat/flacdec.c') diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index f481c10cfa..0be60a4b7e 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -38,10 +38,6 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) int type, width, height; int len, ret = 0; - st = avformat_new_stream(s, NULL); - if (!st) - return AVERROR(ENOMEM); - pb = avio_alloc_context(buf, buf_size, 0, NULL, NULL, NULL, NULL); if (!pb) return AVERROR(ENOMEM); @@ -114,6 +110,12 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) goto fail; } + st = avformat_new_stream(s, NULL); + if (!st) { + ret = AVERROR(ENOMEM); + goto fail; + } + av_init_packet(&st->attached_pic); st->attached_pic.data = data; st->attached_pic.size = len; -- cgit v1.2.3 From b7d3a9a0153bc59cc43b753f0119f36da2b30b1a Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 6 Jul 2012 22:30:17 +0200 Subject: flacdec: be less strict when parsing attached pictures. Only return an error if memory allocation fails or error recognition is set to explode. Otherwise just print an error message and continue reading the file. --- libavformat/flacdec.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'libavformat/flacdec.c') diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 0be60a4b7e..abb36d9377 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -46,8 +46,11 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) type = avio_rb32(pb); if (type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types) || type < 0) { av_log(s, AV_LOG_ERROR, "Invalid picture type: %d.\n", type); - ret = AVERROR_INVALIDDATA; - goto fail; + if (s->error_recognition & AV_EF_EXPLODE) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + type = 0; } /* picture mimetype */ @@ -56,7 +59,8 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) avio_read(pb, mimetype, FFMIN(len, sizeof(mimetype) - 1)) != len) { av_log(s, AV_LOG_ERROR, "Could not read mimetype from an attached " "picture.\n"); - ret = AVERROR_INVALIDDATA; + if (s->error_recognition & AV_EF_EXPLODE) + ret = AVERROR_INVALIDDATA; goto fail; } mimetype[len] = 0; @@ -71,7 +75,8 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) if (id == CODEC_ID_NONE) { av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", mimetype); - ret = AVERROR_INVALIDDATA; + if (s->error_recognition & AV_EF_EXPLODE) + ret = AVERROR_INVALIDDATA; goto fail; } @@ -84,7 +89,9 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) } if (avio_read(pb, desc, len) != len) { - ret = AVERROR(EIO); + av_log(s, AV_LOG_ERROR, "Error reading attached picture description.\n"); + if (s->error_recognition & AV_EF_EXPLODE) + ret = AVERROR(EIO); goto fail; } desc[len] = 0; @@ -98,7 +105,9 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) /* picture data */ len = avio_rb32(pb); if (len <= 0) { - ret = AVERROR_INVALIDDATA; + av_log(s, AV_LOG_ERROR, "Invalid attached picture size: %d.\n", len); + if (s->error_recognition & AV_EF_EXPLODE) + ret = AVERROR_INVALIDDATA; goto fail; } if (!(data = av_malloc(len))) { @@ -106,7 +115,9 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) goto fail; } if (avio_read(pb, data, len) != len) { - ret = AVERROR(EIO); + av_log(s, AV_LOG_ERROR, "Error reading attached picture data.\n"); + if (s->error_recognition & AV_EF_EXPLODE) + ret = AVERROR(EIO); goto fail; } -- cgit v1.2.3