Skip to content

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

Avoid a null pointer dereference on oom when decoding vc1. 

Fixes ticket #2723.
parent d47168e7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
libavcodec/vc1dec.c
View file @ ac83d621
...@@ -5784,6 +5784,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, ...@@ -5784,6 +5784,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
if (avctx->codec_id == AV_CODEC_ID_VC1 || avctx->codec_id == AV_CODEC_ID_VC1IMAGE) { if (avctx->codec_id == AV_CODEC_ID_VC1 || avctx->codec_id == AV_CODEC_ID_VC1IMAGE) {
int buf_size2 = 0; int buf_size2 = 0;
buf2 = av_mallocz(buf_size + FF_INPUT_BUFFER_PADDING_SIZE); buf2 = av_mallocz(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!buf2)
return AVERROR(ENOMEM);
if (IS_MARKER(AV_RB32(buf))) { /* frame starts with marker and needs to be parsed */ if (IS_MARKER(AV_RB32(buf))) { /* frame starts with marker and needs to be parsed */
const uint8_t *start, *end, *next; const uint8_t *start, *end, *next;
......
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