summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Jiang <jianj@google.com>2018-06-07 00:02:48 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-06-07 00:02:48 +0000
commit772452508548c5a0af64802625910cb6ff6473ca (patch)
treee7e0f51b3071a5bbb3c6dc82c242268a06733e53
parent4640c2f58346160a1aedafc323b3d1f322f71e5d (diff)
parent84a9e8eb9a577cb42acf095d0d22b64e416ef61d (diff)
downloadlibvpx-772452508548c5a0af64802625910cb6ff6473ca.tar
libvpx-772452508548c5a0af64802625910cb6ff6473ca.tar.gz
libvpx-772452508548c5a0af64802625910cb6ff6473ca.tar.bz2
libvpx-772452508548c5a0af64802625910cb6ff6473ca.zip
Merge "VP9: fix unsigned integer overflow in decoder."
-rw-r--r--vp9/decoder/vp9_decodeframe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c
index d0e896c13..4fba2e741 100644
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -1528,7 +1528,7 @@ static int tile_worker_hook(void *arg1, void *arg2) {
static int compare_tile_buffers(const void *a, const void *b) {
const TileBuffer *const buf1 = (const TileBuffer *)a;
const TileBuffer *const buf2 = (const TileBuffer *)b;
- return (int)(buf2->size - buf1->size);
+ return (int)((int64_t)buf2->size - buf1->size);
}
static const uint8_t *decode_tiles_mt(VP9Decoder *pbi, const uint8_t *data,