commit c8ab0bcd6173ca1b4f38c98fadb193f72818abe5
author Yaowu Xu <yaowu@google.com> Tue Apr 11 21:53:22 2017 -0700
committer Yaowu Xu <yaowu@google.com> Wed Apr 12 13:57:00 2017 +0000
tree 78aaaa4fe33357e78ff2d641101d8503b8e46374
parent 4330e1bd218c07f577c6d456d438d98dc763a017

Avoid out of bound read

BLOCK_Z_TOKEN is defined "255", this commit change the order of operations
to avoid read  av1_extra_bits[255]. av1_extra_bits is defined with size of
12.

Change-Id: I59c35136bb064391139579bce591d1963e722611

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 57ce7e2..cc6c0e8 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -856,13 +856,13 @@
 
   while (p < stop && p->token != EOSB_TOKEN) {
     const int token = p->token;
-    const av1_extra_bit *const extra_bits = &av1_extra_bits[token];
-
     if (token == BLOCK_Z_TOKEN) {
       aom_write_symbol(w, 0, *p->head_cdf, HEAD_TOKENS + 1);
       p++;
       continue;
     }
+
+    const av1_extra_bit *const extra_bits = &av1_extra_bits[token];
     if (p->eob_val == LAST_EOB) {
       // Just code a flag indicating whether the value is >1 or 1.
       aom_write_bit(w, token != ONE_TOKEN);