Browse Source

vp9: fix mix-up of last-frame/cur-frame in frame size checks.

Fixes invalid reads in fuzzed7.ivf.
tags/n2.2-rc1
Ronald S. Bultje Clément Bœsch 12 years ago
parent
commit
bbc3425fa2
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      libavcodec/vp9.c

+ 5
- 2
libavcodec/vp9.c View File

@@ -525,8 +525,11 @@ static int decode_frame_header(AVCodecContext *ctx,
w = get_bits(&s->gb, 16) + 1;
h = get_bits(&s->gb, 16) + 1;
}
s->use_last_frame_mvs &= s->frames[LAST_FRAME].tf.f->width == w &&
s->frames[LAST_FRAME].tf.f->height == h;
// Note that in this code, "CUR_FRAME" is actually before we
// have formally allocated a frame, and thus actually represents
// the _last_ frame
s->use_last_frame_mvs &= s->frames[CUR_FRAME].tf.f->width == w &&
s->frames[CUR_FRAME].tf.f->height == h;
if (get_bits1(&s->gb)) // display size
skip_bits(&s->gb, 32);
s->highprecisionmvs = get_bits1(&s->gb);


Loading…
Cancel
Save