RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Anton Khirnov 2012-07-06 22:30:17 +02:00
parent dba5b06ead
commit b7d3a9a015
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavformat/flacdec.c
View File

@ -46,8 +46,11 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size)
type = avio_rb32(pb); type = avio_rb32(pb);
if (type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types) || type < 0) { if (type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types) || type < 0) {
av_log(s, AV_LOG_ERROR, "Invalid picture type: %d.\n", type); av_log(s, AV_LOG_ERROR, "Invalid picture type: %d.\n", type);
ret = AVERROR_INVALIDDATA; if (s->error_recognition & AV_EF_EXPLODE) {
goto fail; ret = AVERROR_INVALIDDATA;
goto fail;
}
type = 0;
} }
/* picture mimetype */ /* 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) { avio_read(pb, mimetype, FFMIN(len, sizeof(mimetype) - 1)) != len) {
av_log(s, AV_LOG_ERROR, "Could not read mimetype from an attached " av_log(s, AV_LOG_ERROR, "Could not read mimetype from an attached "
"picture.\n"); "picture.\n");
ret = AVERROR_INVALIDDATA; if (s->error_recognition & AV_EF_EXPLODE)
ret = AVERROR_INVALIDDATA;
goto fail; goto fail;
} }
mimetype[len] = 0; mimetype[len] = 0;
@ -71,7 +75,8 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size)
if (id == CODEC_ID_NONE) { if (id == CODEC_ID_NONE) {
av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n",
mimetype); mimetype);
ret = AVERROR_INVALIDDATA; if (s->error_recognition & AV_EF_EXPLODE)
ret = AVERROR_INVALIDDATA;
goto fail; 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) { 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; goto fail;
} }
desc[len] = 0; desc[len] = 0;
@ -98,7 +105,9 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size)
/* picture data */ /* picture data */
len = avio_rb32(pb); len = avio_rb32(pb);
if (len <= 0) { 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; goto fail;
} }
if (!(data = av_malloc(len))) { if (!(data = av_malloc(len))) {
@ -106,7 +115,9 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size)
goto fail; goto fail;
} }
if (avio_read(pb, data, len) != len) { 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; goto fail;
} }