tree 18427940bccb84840c79594f334bf742c7fb6c6f
parent 9856074bd725a17b62e4d4cc8359abf763dfb576
author Marco Nelissen <marcone@google.com> 1486419150 -0800
committer gitbuildkicker <android-build@google.com> 1487726315 -0800

Fix overflow check and check read result

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