commit d2f624d6cb231c7997c4f7dc80da81e9dcdbf41b
author Yaowu Xu <yaowu@google.com> Tue Feb 27 17:10:33 2018 -0800
committer Yaowu Xu <yaowu@google.com> Wed Feb 28 04:23:08 2018 +0000
tree 9eabcd06dda174b35b7cf9b79f44e020d93484e1
parent 2627e0f616211c803660b10c52ca8bb489ece253

Replace assert with error detection

BUG=aomedia:1453

Change-Id: I8d2316c493897f3ffab512eedd3b95b97a8c2b24

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 5c6793b..e9e26ec 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -332,8 +332,10 @@
 
   int segment_id = neg_deinterleave(coded_id, pred, cm->last_active_segid + 1);
 
-  assert(segment_id >= 0 && segment_id <= cm->last_active_segid);
-
+  if (segment_id < 0 || segment_id > cm->last_active_segid) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Corrupted segment_ids");
+  }
   return segment_id;
 }
 #else