Browse Source

avformat/flic: check for memory allocation failures

Signed-off-by: Paul B Mahol <onemda@gmail.com>
tags/n2.1
Paul B Mahol 11 years ago
parent
commit
00e1bf8a58
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      libavformat/flic.c

+ 6
- 2
libavformat/flic.c View File

@@ -125,8 +125,10 @@ static int flic_read_header(AVFormatContext *s)
}

/* send over the whole 128-byte FLIC header */
st->codec->extradata_size = FLIC_HEADER_SIZE;
st->codec->extradata = av_malloc(FLIC_HEADER_SIZE);
if (!st->codec->extradata)
return AVERROR(ENOMEM);
st->codec->extradata_size = FLIC_HEADER_SIZE;
memcpy(st->codec->extradata, header, FLIC_HEADER_SIZE);

/* peek at the preamble to detect TFTD videos - they seem to always start with an audio chunk */
@@ -176,8 +178,10 @@ static int flic_read_header(AVFormatContext *s)

/* send over abbreviated FLIC header chunk */
av_free(st->codec->extradata);
st->codec->extradata_size = 12;
st->codec->extradata = av_malloc(12);
if (!st->codec->extradata)
return AVERROR(ENOMEM);
st->codec->extradata_size = 12;
memcpy(st->codec->extradata, header, 12);

} else if (magic_number == FLIC_FILE_MAGIC_1) {


Loading…
Cancel
Save