Commit 15879fb4 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "vp9/count_segs: fix out of bounds read" into experimental

parents f0773301 bc3c6d0a
......@@ -123,11 +123,12 @@ static void count_segs(VP9_COMP *cpi,
int bw, int bh, int mi_row, int mi_col) {
VP9_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &cpi->mb.e_mbd;
const int segment_id = mi->mbmi.segment_id;
int segment_id;
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)
segment_id = mi->mbmi.segment_id;
xd->mode_info_context = mi;
set_mi_row_col(cm, xd, mi_row, bh, mi_col, bw);
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