Skip to content

F
ffmpeg.wasm-core
Commit 5e268633 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

Do not leak extradata when encoding avui.

parent fb6c6b15
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
libavcodec/avuienc.c
View file @ 5e268633
...@@ -35,6 +35,16 @@ static av_cold int avui_encode_init(AVCodecContext *avctx) ...@@ -35,6 +35,16 @@ static av_cold int avui_encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n"); av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if (!(avctx->extradata = av_mallocz(24 + FF_INPUT_BUFFER_PADDING_SIZE)))
return AVERROR(ENOMEM);
avctx->extradata_size = 24;
memcpy(avctx->extradata, "\0\0\0\x18""APRGAPRG0001", 16);
if (avctx->field_order > AV_FIELD_PROGRESSIVE) {
avctx->extradata[19] = 2;
} else {
avctx->extradata[19] = 1;
}
return 0; return 0;
} }
...@@ -56,14 +66,7 @@ static int avui_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -56,14 +66,7 @@ static int avui_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if ((ret = ff_alloc_packet2(avctx, pkt, size)) < 0) if ((ret = ff_alloc_packet2(avctx, pkt, size)) < 0)
return ret; return ret;
dst = pkt->data; dst = pkt->data;
if (!(avctx->extradata = av_mallocz(24 + FF_INPUT_BUFFER_PADDING_SIZE))) if (!interlaced) {
return AVERROR(ENOMEM);
avctx->extradata_size = 24;
memcpy(avctx->extradata, "\0\0\0\x18""APRGAPRG0001", 16);
if (interlaced) {
avctx->extradata[19] = 2;
} else {
avctx->extradata[19] = 1;
dst += avctx->width * skip; dst += avctx->width * skip;
} }
......
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