From 50494d5c1b6899b8b9fbaf006a4a86c2b24f82ae Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Tue, 15 Oct 2013 14:06:00 -0700 Subject: [PATCH] Converted assertion to returning error Assertion happens for invalid input data, the commit replace the assertion with returning error. Change-Id: I1b73ae752d64882d984cd23936efe75a757c2b41 --- vp9/decoder/vp9_decodemv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index d89d6b803..8c1399d79 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -504,7 +504,11 @@ static void read_inter_block_mode_info(VP9D_COMP *pbi, MODE_INFO *mi, if (vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) { mbmi->mode = ZEROMV; - assert(bsize >= BLOCK_8X8); + if (bsize < BLOCK_8X8) { + vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, + "Invalid usage of segement feature on small blocks"); + return; + } } else { if (bsize >= BLOCK_8X8) mbmi->mode = read_inter_mode(cm, r, inter_mode_ctx); -- 2.50.0