Fix overflow check and check read result

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