commit 50494d5c1b6899b8b9fbaf006a4a86c2b24f82ae
author Yaowu Xu <yaowu@google.com> Tue Oct 15 14:06:00 2013 -0700
committer Yaowu Xu <yaowu@google.com> Tue Oct 15 14:06:00 2013 -0700
tree 1f8d41a65c06291b399207b1f566cc0229f522c6
parent 52a39f75f25e3c596b39ceff4d07c22c58d90c18

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

diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c
index d89d6b8..8c1399d 100644
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -504,7 +504,11 @@
 
   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);