Commit 47a72134 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3ef6c526'

* commit '3ef6c526':
  a64: check that extradata exists before reading from it
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c7c11058 3ef6c526
...@@ -34,6 +34,12 @@ static int a64_write_header(AVFormatContext *s) ...@@ -34,6 +34,12 @@ static int a64_write_header(AVFormatContext *s)
0x00, //charset_lifetime (multi only) 0x00, //charset_lifetime (multi only)
0x00 //fps in 50/fps; 0x00 //fps in 50/fps;
}; };
if (avctx->extradata_size < 4) {
av_log(s, AV_LOG_ERROR, "Missing extradata\n");
return AVERROR(EINVAL);
}
switch (avctx->codec->id) { switch (avctx->codec->id) {
case AV_CODEC_ID_A64_MULTI: case AV_CODEC_ID_A64_MULTI:
header[2] = 0x00; header[2] = 0x00;
......
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