tree 57de86cf89cc881937a920464b98999c0f4cc1d0
parent 7245a543f356484c05869f4924d1f5caa3bbff3b
author John Rummell <jrummell@chromium.org> 1414711035 -0700
committer John Rummell <jrummell@chromium.org> 1414711141 +0000

Merge to M39: Add extra checks to avoid integer overflow.

BUG=425980
TEST=no crash with ASAN

Review URL: https://codereview.chromium.org/659743004

Cr-Commit-Position: refs/heads/master@{#301249}
(cherry picked from commit b2006ac87cec58363090e7d5e10d5d9e3bbda9f9)

R=xhwang@chromium.org

Review URL: https://codereview.chromium.org/695673002

Cr-Commit-Position: refs/branch-heads/2171@{#312}
Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}