am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '4a5fbf74b493eb293918c41a5b5f60dd7b8ebb58':
  Fix several ineffective integer overflow checks