commit 40ef0c7fc803e5f201530b53c617ed1e18545c34
author Yaowu Xu <yaowu@yaowu-macbookpro.roam.corp.google.com> Sun Feb 18 14:06:55 2018 -0800
committer Yaowu Xu <yaowu@google.com> Mon Feb 19 01:03:12 2018 +0000
tree a87d9184a2ebba6498af04ebf0355c8cae06833c
parent f0e12c271141d0e4b5786d0666e00df78a45ceb4

Promote to 64 bit befoer a large shift

The shift is as large as 49, which does not fit in 32 bit.

Change-Id: Ic84e4eacfde7be386cbff411391366e0559a2824

aom/src/aom_integer.c

diff --git a/aom/src/aom_integer.c b/aom/src/aom_integer.c
index 5aa9f1e..eb88220 100644
--- a/aom/src/aom_integer.c
+++ b/aom/src/aom_integer.c
@@ -29,7 +29,7 @@
   if (buffer && value) {
     for (size_t i = 0; i < kMaximumLeb128Size && i < available; ++i) {
       const uint8_t decoded_byte = *(buffer + i) & kLeb128ByteMask;
-      *value |= decoded_byte << (i * 7);
+      *value |= ((uint64_t)decoded_byte) << (i * 7);
       if ((*(buffer + i) >> 7) == 0) {
         status = 0;
         break;