Commit 8cd8837b2f for aom
commit 8cd8837b2f47716a3e41921cfc65e8032a69a3c6
Author: Marco Paniconi <marpan@google.com>
Date: Thu Dec 4 09:46:21 2025 -0800
Move assert check on mi->bsize up to before its used.
And add mi != NULL check.
Change-Id: I2566cd320ccfe28592d1a022ee3c3758efe57957
diff --git a/av1/encoder/encodeframe_utils.c b/av1/encoder/encodeframe_utils.c
index 79da14feb9..b296dbaaab 100644
--- a/av1/encoder/encodeframe_utils.c
+++ b/av1/encoder/encodeframe_utils.c
@@ -185,6 +185,7 @@ void av1_update_state(const AV1_COMP *const cpi, ThreadData *td,
MB_MODE_INFO *const mi_addr = xd->mi[0];
const struct segmentation *const seg = &cm->seg;
assert(bsize < BLOCK_SIZES_ALL);
+ assert(mi != NULL && mi->bsize == bsize);
const int bw = mi_size_wide[mi->bsize];
const int bh = mi_size_high[mi->bsize];
const int mis = mi_params->mi_stride;
@@ -192,8 +193,6 @@ void av1_update_state(const AV1_COMP *const cpi, ThreadData *td,
const int mi_height = mi_size_high[bsize];
TxfmSearchInfo *txfm_info = &x->txfm_search_info;
- assert(mi->bsize == bsize);
-
*mi_addr = *mi;
copy_mbmi_ext_frame_to_mbmi_ext(&x->mbmi_ext, &ctx->mbmi_ext_best,
av1_ref_frame_type(ctx->mic.ref_frame));