Commit d256ed78 authored by Anton Khirnov's avatar Anton Khirnov

4xm: allocate extradata properly.

Pad it with the required amount of zeros, check for malloc failure.
parent fd056029
...@@ -110,8 +110,11 @@ static int parse_vtrk(AVFormatContext *s, ...@@ -110,8 +110,11 @@ static int parse_vtrk(AVFormatContext *s,
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = AV_CODEC_ID_4XM; st->codec->codec_id = AV_CODEC_ID_4XM;
st->codec->extradata = av_mallocz(4 + FF_INPUT_BUFFER_PADDING_SIZE);
if (!st->codec->extradata)
return AVERROR(ENOMEM);
st->codec->extradata_size = 4; st->codec->extradata_size = 4;
st->codec->extradata = av_malloc(4);
AV_WL32(st->codec->extradata, AV_RL32(buf + 16)); AV_WL32(st->codec->extradata, AV_RL32(buf + 16));
st->codec->width = AV_RL32(buf + 36); st->codec->width = AV_RL32(buf + 36);
st->codec->height = AV_RL32(buf + 40); st->codec->height = AV_RL32(buf + 40);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment