generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flacdec: don't create an attached picture stream until we have all information.

Browse Source 
This way we don't end with an invalid stream if parsing the picture
fails.
This commit is contained in:
Anton Khirnov 2012-07-06 22:21:09 +02:00
parent fdaad6354f
commit dba5b06ead
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/flacdec.c
View File

@ -38,10 +38,6 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size)
int type, width, height; int type, width, height;
int len, ret = 0; 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); pb = avio_alloc_context(buf, buf_size, 0, NULL, NULL, NULL, NULL);
if (!pb) if (!pb)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -114,6 +110,12 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size)
goto fail; goto fail;
} }
st = avformat_new_stream(s, NULL);
if (!st) {
ret = AVERROR(ENOMEM);
goto fail;
}
av_init_packet(&st->attached_pic); av_init_packet(&st->attached_pic);
st->attached_pic.data = data; st->attached_pic.data = data;
st->attached_pic.size = len; st->attached_pic.size = len;