diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-01-22 09:10:44 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2014-01-22 09:10:44 -0800 |
| commit | ebe160568b163bfae72f654ee517a12d838d8595 (patch) | |
| tree | 4d1d95e69ddc67aa8059160b9fae2f36bdf233e6 /vp9/encoder/vp9_encodeframe.c | |
| parent | dbae98082c1129191db46d94ddb45609fc7897c4 (diff) | |
| download | libvpx-ebe160568b163bfae72f654ee517a12d838d8595.tar libvpx-ebe160568b163bfae72f654ee517a12d838d8595.tar.gz libvpx-ebe160568b163bfae72f654ee517a12d838d8595.tar.bz2 libvpx-ebe160568b163bfae72f654ee517a12d838d8595.zip | |
Prevent invaid memory access
Reading second motion vector only when it has a second ref_frame
Change-Id: Ica72c1cd955832e15ceccda5e5a17b0bfcd83044
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 9966cb6ae..9d02c8f95 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -500,7 +500,7 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx, if (is_inter_block(mbmi) && (mbmi->sb_type < BLOCK_8X8 || mbmi->mode == NEWMV)) { int_mv best_mv[2]; - for (i = 0; i < 2; ++i) + for (i = 0; i < 1 + has_second_ref(mbmi); ++i) best_mv[i].as_int = mbmi->ref_mvs[mbmi->ref_frame[i]][0].as_int; vp9_update_mv_count(cpi, x, best_mv); } |