Browse Source

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.
tags/n1.0
Anton Khirnov 13 years ago
parent
commit
dba5b06ead
1 changed files with 6 additions and 4 deletions
  1. +6
    -4
      libavformat/flacdec.c

+ 6
- 4
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 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;


Loading…
Cancel
Save