Browse Source

Avoid a null pointer dereference on oom when decoding vc1.

Fixes ticket #2723.
tags/n2.0
Carl Eugen Hoyos 12 years ago
parent
commit
ac83d62136
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      libavcodec/vc1dec.c

+ 2
- 0
libavcodec/vc1dec.c View File

@@ -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) {
int buf_size2 = 0;
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 */
const uint8_t *start, *end, *next;


Loading…
Cancel
Save