tree e67dbb5720a17e16ca386eba82194ca93c74b56f
parent 63cc61ff0f25dc3c8442e5f1b17c31bc6d98f69f
author Marco Nelissen <marcone@google.com> 1486419150 -0800
committer gitbuildkicker <android-build@google.com> 1487799868 -0800

Fix overflow check and check read result

Bug: 33861560
Test: build
Change-Id: Ia85519766e19a6e37237166f309750b3e8323c4e
(cherry picked from commit 9667e3eff2d34c3797c3b529370de47b2c1f1bf6)