commit cf1581c66c2ad8c5b1aaca2e43e350cf5974f46d
author Joshua J. Drake <android-open-source@qoop.org> Wed Apr 08 23:23:55 2015 -0500
committer The Android Automerger <android-build@google.com> Thu Jul 09 14:02:59 2015 -0700
tree 2ba382f23813c0a8acc9a206e4f6dd09527731a1
parent 22412164dee9f658272a25833aebe83d05dfe4ff

Fix several ineffective integer overflow checks

Commit edd4a76 (which addressed bugs 15328708, 15342615, 15342751) added
several integer overflow checks. Unfortunately, those checks fail to take into
account integer promotion rules and are thus themselves subject to an integer
overflow. Cast the sizeof() operator to a uint64_t to force promotion while
multiplying.

Bug: 20139950

(cherry picked from commit e2e812e58e8d2716b00d7d82db99b08d3afb4b32)

Change-Id: I080eb3fa147601f18cedab86e0360406c3963d7b