am 030d8d0a: Fix several ineffective integer overflow checks

* commit '030d8d0a557097b88d6ecbf6d04823213512b620':
  Fix several ineffective integer overflow checks